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

Timestamp:

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

Author:

sandervl

Message:

Changed default hittest handler to check for WS_EX_TOOLWINDOW (system menu & min/max buttons)

File:

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

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.51 2003-04-11 15:22:34 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.52 2003-04-11 15:45:13 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -530 +530 @@
     {
       /* Check system menu */
-      if(dwStyle & WS_SYSMENU)
+      if ((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW))
       {
         /* Check if there is an user icon */
@@ -550 +550 @@
       /* Check maximize box */
       /* In win95 there is automatically a Maximize button when there is a minimize one*/
-      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))
           rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
       if (pt.x > rect.right) return HTMAXBUTTON;
@@ -556 +558 @@
       /* Check minimize box */
       /* In win95 there is automatically a Maximize button when there is a Maximize one*/
-      if ((dwStyle & WS_MINIMIZEBOX)||(dwStyle & WS_MAXIMIZEBOX))
+      //Testing in NT4 shows that tool windows never have a minimize or maximize button!
+      if (((dwStyle & WS_MINIMIZEBOX) || (dwStyle & WS_MAXIMIZEBOX)) &&
+          !(dwExStyle & WS_EX_TOOLWINDOW))
           rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;