Changeset 9575 for trunk/src/user32/win32wbase.cpp

Timestamp:

Jan 1, 2003, 3:29:45 PM (23 years ago)

Author:

sandervl

Message:

Fixes for windows with an iconless class and WS_EX_DLGMODALFRAME style. (they shouldn't have a system menu)

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.348 2002-12-31 16:52:00 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.349 2003-01-01 14:29:44 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1374 +1374 @@
       OSLibWinPositionFrameControls(getOS2FrameWindowHandle(), &rectOS2,
                                     dwStyle, dwExStyle, IconForWindow(ICON_SMALL),
-                                    fCloseButton);
+                                    fCloseButton, windowClass->getIcon() != NULL);
   }
   return rc;
@@ -3712 +3712 @@
                 setStyle(ss.styleNew);
                 SendMessageA(getWindowHandle(),WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
-                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
+                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), 
+                                    getStyle(), getExStyle());
 
                 //TODO: Might not be correct to use ShowWindow here