Changeset 2852 for trunk/src/user32/win32wmdiclient.cpp

Timestamp:

Feb 21, 2000, 6:25:33 PM (26 years ago)

Author:

cbratschi

Message:

merged with Corel WINE 20000212, added WS_EX_CONTEXTHELP

File:

• trunk/src/user32/win32wmdiclient.cpp (modified) (3 diffs)

trunk/src/user32/win32wmdiclient.cpp

@@ -1 @@
-/* $Id: win32wmdiclient.cpp,v 1.24 2000-02-16 14:28:24 sandervl Exp $ */
+/* $Id: win32wmdiclient.cpp,v 1.25 2000-02-21 17:25:32 cbratschi Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -36 +36 @@
 #include "win32wndhandle.h"
 
-#define DBG_LOCALLOG    DBG_win32wmdiclient
+#define DBG_LOCALLOG    DBG_win32wmdiclient
 #include "dbglocal.h"
 
@@ -857 +857 @@
   // In Win 95 look, the system menu is replaced by the child icon
 
-  HICON hIcon = GetClassLongA(child->getWindowHandle(), GCL_HICONSM);
-  if (!hIcon)
-    hIcon = GetClassLongA(child->getWindowHandle(), GCL_HICON);
+  /* Find small icon */
+  HICON hIcon = child->GetSmallIcon();
+
+  /* If no small icon or overwridden large icon, use class small icon.. */
+  if (!hIcon && !child->GetIcon())
+    hIcon = GetClassLongA(child->getWindowHandle(),GCL_HICONSM);
+
+  /* Use large icon */
+  if (!hIcon) hIcon = child->GetIcon();
+
+  /* If all else fails, use large class icon. */
+  if (!hIcon) hIcon = GetClassLongA(child->getWindowHandle(),GCL_HICON);
+
   if (hIcon)
   {