[hbelusca] 71325: [PROGMAN] - Load the main icon in a global variable (we use it at different places). - Use the main icon for the shell-about dialog.

Author: hbelusca
Date: Thu May 12 19:54:53 2016
New Revision: 71325

URL: http://svn.reactos.org/svn/reactos?rev=71325&view=rev
Log:
[PROGMAN]
- Load the main icon in a global variable (we use it at different places).
- Use the main icon for the shell-about dialog.

Modified:
    trunk/reactos/base/shell/progman/main.c
    trunk/reactos/base/shell/progman/progman.h

Modified: trunk/reactos/base/shell/progman/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/main.c?r...
==============================================================================
--- trunk/reactos/base/shell/progman/main.c	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/progman/main.c	[iso-8859-1] Thu May 12 19:54:53 2016
@@ -620,11 +620,10 @@
     MAIN_LoadSettings();

/* Load the default icons */
+    Globals.hDefaultIcon       = LoadIconW(NULL, MAKEINTRESOURCEW(IDI_WINLOGO));
+    Globals.hMainIcon          = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_APPICON));
     Globals.hPersonalGroupIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_GROUP_PERSONAL_ICON));
     Globals.hCommonGroupIcon   = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_GROUP_COMMON_ICON));
-    Globals.hDefaultIcon       = LoadIconW(NULL, MAKEINTRESOURCEW(IDI_WINLOGO));
-
-    // Globals.hMainIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_APPICON));

/* Initialize the common controls */
     icex.dwSize = sizeof(icex);
@@ -1036,7 +1035,7 @@
             break;

case PM_ABOUT:
-            ShellAboutW(hWnd, szTitle, NULL, NULL);
+            ShellAboutW(hWnd, szTitle, NULL, Globals.hMainIcon);
             break;

default:
@@ -1060,7 +1059,7 @@
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = 0;
     wndClass.hInstance     = Globals.hInstance;
-    wndClass.hIcon         = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_APPICON));
+    wndClass.hIcon         = Globals.hMainIcon;
     wndClass.hCursor       = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_ARROW));
     wndClass.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
     wndClass.lpszMenuName  = NULL;

Modified: trunk/reactos/base/shell/progman/progman.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman....
==============================================================================
--- trunk/reactos/base/shell/progman/progman.h	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/progman/progman.h	[iso-8859-1] Thu May 12 19:54:53 2016
@@ -147,11 +147,11 @@
     HACCEL    hAccel;
     HWND      hMainWnd;
     HWND      hMDIWnd;
-    //HICON   hMainIcon;
-    HICON     hGroupIcon;
+    HICON     hDefaultIcon;
+    HICON     hMainIcon;
+    // HICON     hGroupIcon;
     HICON     hPersonalGroupIcon;
     HICON     hCommonGroupIcon;
-    HICON     hDefaultIcon;
     HMENU     hMainMenu;
     HMENU     hFileMenu;
     HMENU     hOptionMenu;