user32: Use the window class icon if the MDI child doesn't have its own.

5579967c · Alex Henrie · Alexandre Julliard · f2bf0227 · 5579967c
Commit 5579967c authored May 13, 2015 by Alex Henrie Committed by Alexandre Julliard May 14, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

mdi.c dlls/user32/mdi.c +4 -0

No files found.
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -864,8 +864,12 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild )
    /* The system menu is replaced by the child icon */
    hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_SMALL, 0);
    if (!hIcon)
+        hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICONSM);
+    if (!hIcon)
        hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0);
    if (!hIcon)
+        hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON);
+    if (!hIcon)
        hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON),
                           GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);
    if (hIcon)