Changeset 20119

Timestamp:

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

Author:

sandervl

Message:

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

Location:

tags/trunk/src/user32

Files:

• oslibwin.cpp (modified) (8 diffs)
• oslibwin.h (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbasenonclient.cpp (modified) (4 diffs)

tags/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
 }
-
 //******************************************************************************
 //******************************************************************************

tags/trunk/src/user32/oslibwin.h ¶

@@ -1 @@
-/* $Id: oslibwin.h,v 1.69 2002-10-15 09:18:10 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.70 2003-01-01 14:29:43 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -44 +44 @@
                            int classStyle, HWND *hwndFrame);
 
-BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, ULONG *OSFrameStyle);
-void  OSLibSetWindowStyle(HWND hwndFrame, HWND hwndClient, ULONG dwStyle, ULONG dwExStyle);
+BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, 
+                           ULONG *OSFrameStyle);
+void  OSLibSetWindowStyle(HWND hwndFrame, HWND hwndClient, ULONG dwStyle, 
+                          ULONG dwExStyle);
+
 DWORD OSLibQueryWindowStyle(HWND hwnd);
 
-BOOL  OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, DWORD dwExStyle, HICON hSysMenuIcon, BOOL drawCloseButton);
+BOOL  OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, 
+                                    DWORD dwExStyle, HICON hSysMenuIcon, 
+                                    BOOL drawCloseButton, BOOL fClassIcon);
 BOOL  OSLibChangeCloseButtonState(HWND hwndFrame, BOOL State);
 

tags/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

tags/trunk/src/user32/win32wbasenonclient.cpp ¶

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.45 2002-12-29 17:17:16 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.46 2003-01-01 14:29:45 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -907 +907 @@
 
   if(fOS2Look) {
-      if ((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW) &&
-           fOS2Look != OS2_APPEARANCE_SYSMENU)
+      //Note: If no class icon *and* WS_EX_DLGMODALFRAME -> no system menu
+      if((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW) &&
+         !(!windowClass->getIcon() && (dwExStyle & WS_EX_DLGMODALFRAME)) &&
+         fOS2Look != OS2_APPEARANCE_SYSMENU)
       {
          HICON hSysIcon = IconForWindow(ICON_SMALL);
@@ -986 +988 @@
   }
 
-  if ((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW))
+  //Note: If no class icon *and* WS_EX_DLGMODALFRAME -> no system menu
+  if((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW) &&
+     !(!windowClass->getIcon() && (dwExStyle & WS_EX_DLGMODALFRAME)))
   {
     if (DrawSysButton(memDC,&r))
@@ -1550 +1554 @@
   return DrawCaptionTemp(hwnd,hdc,rect,hFont,hIcon,(LPWSTR)str,uFlags,TRUE);
 }
-
+#if 0
+//Control helpers
+/***********************************************************************
+ *           NC_GetSysPopupPos
+ */
+void NC_GetSysPopupPos( HWND hwnd, RECT* rect )
+{
+    if (IsIconic(hwnd)) GetWindowRect( hwnd, rect );
+    else
+    {
+#ifdef __WIN32OS2__
+        Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+        if (!win32wnd) return;
+
+        win32wnd->GetSysPopupPos(rect);
+
+        RELEASE_WNDOBJ(win32wnd);
+#else
+        WND *wndPtr = WIN_FindWndPtr( hwnd );
+        if (!wndPtr) return;
+
+        NC_GetInsideRect( hwnd, rect );
+        OffsetRect( rect, wndPtr->rectWindow.left, wndPtr->rectWindow.top);
+        if (wndPtr->dwStyle & WS_CHILD)
+            ClientToScreen( GetParent(hwnd), (POINT *)rect );
+        if (TWEAK_WineLook == WIN31_LOOK) {
+            rect->right = rect->left + GetSystemMetrics(SM_CXSIZE);
+            rect->bottom = rect->top + GetSystemMetrics(SM_CYSIZE);
+        }
+        else {
+            rect->right = rect->left + GetSystemMetrics(SM_CYCAPTION) - 1;
+            rect->bottom = rect->top + GetSystemMetrics(SM_CYCAPTION) - 1;
+        }
+        WIN_ReleaseWndPtr( wndPtr );
+#endif
+    }
+}
+//*****************************************************************************
+//*****************************************************************************
+BOOL NC_DrawSysButton95 (HWND hwnd, HDC hdc, BOOL down)
+{
+    BOOL ret;
+
+    Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if (!win32wnd) return FALSE;
+
+    ret = win32wnd->DrawSysButton(hwnd, hdc);
+
+    RELEASE_WNDOBJ(win32wnd);
+
+    return ret;
+}
+#endif