From 1e2e730dd341f51a2a00d88bb16b625ab766c5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 12 May 2016 19:54:53 +0000 Subject: [PATCH] [PROGMAN] - Load the main icon in a global variable (we use it at different places). - Use the main icon for the shell-about dialog. svn path=/trunk/; revision=71325 --- reactos/base/shell/progman/main.c | 9 ++++----- reactos/base/shell/progman/progman.h | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/reactos/base/shell/progman/main.c b/reactos/base/shell/progman/main.c index 71a1d2dfef9..7d9f593e10d 100644 --- a/reactos/base/shell/progman/main.c +++ b/reactos/base/shell/progman/main.c @@ -620,11 +620,10 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi 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 @@ static VOID MAIN_MenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) break; case PM_ABOUT: - ShellAboutW(hWnd, szTitle, NULL, NULL); + ShellAboutW(hWnd, szTitle, NULL, Globals.hMainIcon); break; default: @@ -1060,7 +1059,7 @@ static ATOM MAIN_RegisterMainWinClass(VOID) 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; diff --git a/reactos/base/shell/progman/progman.h b/reactos/base/shell/progman/progman.h index 690801d7357..fea60ab70c7 100644 --- a/reactos/base/shell/progman/progman.h +++ b/reactos/base/shell/progman/progman.h @@ -147,11 +147,11 @@ typedef struct _GLOBALS 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;