Changeset 10013 for trunk/src/user32/win32wbasenonclient.cpp

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

File:

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

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