Changeset 9575 for trunk/src/user32/oslibwin.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/oslibwin.cpp (modified) (8 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.131 2002-12-29 17:17:16 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.132 2003-01-01 14:29:42 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -117 +117 @@
 //Note: Also check OSLibSetWindowStyle when changing this!!
 //******************************************************************************
-BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, ULONG *OSFrameStyle)
+BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, 
+                          ULONG *OSFrameStyle)
 {
   *OSWinStyle   = 0;
@@ -135 +136 @@
       if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W) {
           *OSFrameStyle = FCF_TITLEBAR;
+
           if((dwStyle & WS_SYSMENU_W) && !(dwExStyle & WS_EX_TOOLWINDOW_W))
           {
@@ -155 +157 @@
 //******************************************************************************
 BOOL OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, 
-                                   DWORD dwExStyle, HICON hSysMenuIcon, BOOL drawCloseButton)
+                                   DWORD dwExStyle, HICON hSysMenuIcon, 
+                                   BOOL drawCloseButton, BOOL fClassIcon)
 {
   SWP  swp[3];
@@ -171 +174 @@
   
   if(fOS2Look == OS2_APPEARANCE_SYSMENU) {
+      //Note: If no class icon *and* WS_EX_DLGMODALFRAME -> no system menu!!
+      //      --> TODO
       hwndControl = WinWindowFromID(hwndFrame, FID_SYSMENU);
       if(hwndControl) {
@@ -187 +192 @@
           i++;
       }
-
   }
   else
-  if((dwStyle & WS_SYSMENU_W) && !(dwExStyle & WS_EX_TOOLWINDOW_W) && hSysMenuIcon) {
+  //Note: If no class icon *and* WS_EX_DLGMODALFRAME -> no system menu!!
+  if((dwStyle & WS_SYSMENU_W) && !(dwExStyle & WS_EX_TOOLWINDOW_W) &&
+     !(!fClassIcon && (dwExStyle & WS_EX_DLGMODALFRAME_W)) && hSysMenuIcon)
+  {
       pRect->xLeft += minmaxwidth/2;
   }
@@ -988 +995 @@
 //******************************************************************************
 //******************************************************************************
-void OSLibSetWindowStyle(HWND hwndFrame, HWND hwndClient, ULONG dwStyle, ULONG dwExStyle)
+void OSLibSetWindowStyle(HWND hwndFrame, HWND hwndClient, ULONG dwStyle, 
+                         ULONG dwExStyle)
 {
     ULONG dwWinStyle;
@@ -1095 +1103 @@
    } // os2look
 }
-
 //******************************************************************************
 //******************************************************************************