Changeset 10013 for trunk/src

Timestamp:

Apr 11, 2003, 5:22:34 PM (22 years ago)

Author:

sandervl

Message:

Tool windows don't have minimize or maximize buttons; always draw tool windows in win32 style as they are not compatible with PM frame controls

Location:

trunk/src/user32

Files:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.141 2003-03-27 11:02:26 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.142 2003-04-11 15:22:33 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -62 +62 @@
                           char *pszName, HWND Owner, ULONG fHWND_BOTTOM,
                           ULONG id, BOOL fTaskList,BOOL fShellPosition,
-                          int classStyle, HWND *hwndFrame)
+                          DWORD classStyle, HWND *hwndFrame)
 {
  HWND  hwndClient;
@@ -101 +101 @@
                            Owner, (fHWND_BOTTOM) ? HWND_BOTTOM : HWND_TOP,
                            id, (PVOID)&FCData, NULL);
+
     if(fOS2Look && *hwndFrame) {
         FCData.flCreateFlags = dwOSFrameStyle;
@@ -142 +143 @@
         *OSWinStyle |= WS_TOPMOST;
 
-  if(fOS2Look) {
+  //WS_EX_TOOLWINDOW is incompatible with the OS2Look (titlebar thinner + smaller font)
+  if(fOS2Look && !(dwExStyle & WS_EX_TOOLWINDOW_W)) 
+  {
       if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W) {
           *OSFrameStyle = FCF_TITLEBAR;
@@ -176 +179 @@
 
   dprintf(("OSLibWinPositionFrameControls %x (%x,%x) %x %d", hwndFrame, dwStyle, dwExStyle, hSysMenuIcon, drawCloseButton));
+
+  //WS_EX_TOOLWINDOW is incompatible with the OS2Look (titlebar thinner + smaller font)
+  if(dwExStyle & WS_EX_TOOLWINDOW_W) {
+      DebugInt3();
+      return FALSE;
+  }
 
   if(minmaxwidth == 0) {
@@ -1075 +1084 @@
       dwWinStyle &= ~WS_MAXIMIZED;
 
-    if(fOS2Look) {
+    //WS_EX_TOOLWINDOW is incompatible with the OS2Look (titlebar thinner + smaller font)
+    if(fOS2Look && !(dwExStyle & WS_EX_TOOLWINDOW_W)) {
         ULONG OSFrameStyle = 0;
         SWP rc1,rc2,rc3;
@@ -1164 +1174 @@
 
    if(dwWinStyle != dwOldWinStyle) {
-          dprintf(("Setting new window U long"));
-          WinSetWindowULong(hwndFrame, QWL_STYLE, dwWinStyle);
+       dprintf(("Setting new window U long"));
+       WinSetWindowULong(hwndFrame, QWL_STYLE, dwWinStyle);
    }
 

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.74 2003-03-27 11:02:26 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.75 2003-04-11 15:22:33 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -44 +44 @@
                            char *pszName, HWND Owner, ULONG fBottom,
                            ULONG id, BOOL fTaskList,BOOL fShellPosition, 
-                           int classStyle, HWND *hwndFrame);
+                           DWORD classStyle, HWND *hwndFrame);
 
 BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.365 2003-03-29 16:38:00 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.366 2003-04-11 15:22:33 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1390 +1390 @@
   }
 #endif
-  if(fOS2Look && ((dwStyle & WS_CAPTION) == WS_CAPTION))
+  //WS_EX_TOOLWINDOW is incompatible with the OS2Look (titlebar thinner + smaller font)
+  if(fOS2Look && ((dwStyle & WS_CAPTION) == WS_CAPTION) && !(dwExStyle & WS_EX_TOOLWINDOW)) 
   {
       RECT rect = {0};

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.50 2003-02-28 09:56:00 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.51 2003-04-11 15:22:34 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -906 +906 @@
   HBITMAP memBmp,oldBmp;
 
-  if(fOS2Look) {
+  //WS_EX_TOOLWINDOW is incompatible with the OS2Look (titlebar thinner + smaller font)
+  if(fOS2Look && !(dwExStyle & WS_EX_TOOLWINDOW)) {
       //Note: If no class icon *and* WS_EX_DLGMODALFRAME -> no system menu
       if((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW) &&
@@ -1014 +1015 @@
     }
 
-    if ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))
+    //Testing in NT4 shows that tool windows never have a minimize or maximize button!
+    if (((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX)) &&
+        !(dwExStyle & WS_EX_TOOLWINDOW))
     {
       /* In win95 the two buttons are always there */