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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7a43e790874106d58f0b92cc914c06271585a993
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7a43e790874106d58f0b92cc914c06271585a993

Author: Huw Davies <huw at codeweavers.com>
Date:   Fri Mar 16 14:53:16 2007 +0000

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

---

 dlls/user32/mdi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index 8da2060..976bce3 100644
--- 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)