user32: Use a window's icon in preference to its class icon.

7a43e790 · Huw Davies · Alexandre Julliard · 1c559eb4 · 7a43e790
Commit 7a43e790 authored Mar 16, 2007 by Huw Davies Committed by Alexandre Julliard Mar 17, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mdi.c dlls/user32/mdi.c +2 -2

No files found.
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -853,9 +853,9 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild )
                (LPCWSTR)HBMMENU_MBAR_CLOSE : (LPCWSTR)HBMMENU_MBAR_CLOSE_D );

    /* The system menu is replaced by the child icon */
-    hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICONSM);
+    hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_SMALL, 0);
    if (!hIcon)
-        hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON);
+        hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0);
    if (!hIcon)
        hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
    if (hIcon)