From 41c48117ca5339284af3422b48c88e124844b94c Mon Sep 17 00:00:00 2001 From: learn_more Date: Thu, 17 Mar 2016 22:22:45 +0100 Subject: [PATCH] Port r68096 and r68097 [RAPPS_NEW] Fix the fact that the rapps download dialog uses the 32pixel icon for the download window. By Ismael Ferreras Morezuelas (IRC name swyter). CORE-9750 --- src/base/applications/rapps_new/loaddlg.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/base/applications/rapps_new/loaddlg.cpp b/src/base/applications/rapps_new/loaddlg.cpp index a8733a0..109316e 100644 --- a/src/base/applications/rapps_new/loaddlg.cpp +++ b/src/base/applications/rapps_new/loaddlg.cpp @@ -36,7 +36,6 @@ #include static PAPPLICATION_INFO AppInfo; -static HICON hIcon = NULL; class CDownloadDialog : public CComObjectRootEx, @@ -365,12 +364,16 @@ DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) switch (Msg) { case WM_INITDIALOG: + { + HICON hIconSm = NULL, hIconBg = NULL; + + hIconBg = (HICON)GetClassLongPtr(hMainWnd, GCLP_HICON); + hIconSm = (HICON)GetClassLongPtr(hMainWnd, GCLP_HICONSM); - hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); - if (hIcon) + if (hIconBg && hIconSm) { - SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon); - SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIcon); + SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIconBg); + SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm); } SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0); @@ -385,7 +388,7 @@ DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) if (!Thread) return FALSE; CloseHandle(Thread); return TRUE; - + } case WM_COMMAND: if (wParam == IDCANCEL) { @@ -395,7 +398,6 @@ DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) return FALSE; case WM_CLOSE: - if (hIcon) DestroyIcon(hIcon); EndDialog(Dlg, 0); return TRUE; -- 2.7.0.windows.2