commit 8bb7fb960c0e0ff40ec72c0d9fcf852326c609ce
author Alexandre Julliard <julliard@winehq.org> Sat Jan 20 02:48:30 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Jan 20 02:48:30 2001 +0000
tree 8ae01b70c4fd7a9795fbe70e40af7d7ad879e9df
parent ebc5fe96c636008fafe994fb038f69c0d5b7de59

Fixed a number of incompatibilities in OEM icons/cursors handling.

programs/progman/group.c

diff --git a/programs/progman/group.c b/programs/progman/group.c
index d8cf17d..0a623a7 100644
--- a/programs/progman/group.c
+++ b/programs/progman/group.c
@@ -51,7 +51,7 @@
   class.cbClsExtra    = 0;
   class.cbWndExtra    = sizeof(LONG);
   class.hInstance     = Globals.hInstance;
-  class.hIcon         = LoadIcon (0, MAKEINTRESOURCE(OIC_WINEICON));
+  class.hIcon         = LoadIcon (0, IDI_WINLOGO);
   class.hCursor       = LoadCursor (0, IDC_ARROW);
   class.hbrBackground = GetStockObject (WHITE_BRUSH);
   class.lpszMenuName  = 0;

programs/progman/progman.h

diff --git a/programs/progman/progman.h b/programs/progman/progman.h
index a367518..ce5f19b 100644
--- a/programs/progman/progman.h
+++ b/programs/progman/progman.h
@@ -16,11 +16,7 @@
 #include "windows.h"
 
 /* Fallback icon */
-#ifdef WINELIB
-#define DEFAULTICON OIC_WINEICON
-#else
-#define DEFAULTICON OIC_LANDSCAPE
-#endif
+#define DEFAULTICON OIC_WINLOGO
 
 /* Icon index in M$ Window's progman.exe  */
 #define PROGMAN_ICON_INDEX 0

programs/progman/program.c

diff --git a/programs/progman/program.c b/programs/progman/program.c
index 15346be..3937237 100644
--- a/programs/progman/program.c
+++ b/programs/progman/program.c
@@ -95,7 +95,7 @@
 				&nCmdShow, MAX_PATHNAME_LEN))
     return;
 
-  if (!hIcon) hIcon = LoadIcon(0, MAKEINTRESOURCE(OIC_WINEICON));
+  if (!hIcon) hIcon = LoadIcon(0, IDI_WINLOGO);
 
 
   if (!PROGRAM_AddProgram(hGroup, hIcon, szName, 0, 0, szCmdLine, szIconFile,