Changeset 5258 for trunk/src/user32/win32wbase.cpp

Timestamp:

Feb 23, 2001, 3:52:42 PM (25 years ago)

Author:

sandervl

Message:

mdi, setcursor, min/max/restore, dlglist changes

File:

• trunk/src/user32/win32wbase.cpp (modified) (8 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.243 2001-02-22 18:18:59 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.244 2001-02-23 14:52:41 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -105 +105 @@
   fCreateSetWindowPos = FALSE;
   fCreationFinished= FALSE;
+  fMinMaxChange    = FALSE;
 
   windowNameA      = NULL;
@@ -1489 +1490 @@
     {
         dprintf(("DefWndProc: WM_SETCURSOR for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
-        if((getStyle() & WS_CHILD) && !(getExStyle() & WS_EX_NOPARENTNOTIFY))
+        if((getStyle() & WS_CHILD))
         {
             if(getParent()) {
@@ -1496 +1497 @@
             }
         }
-        if (wParam == Win32Hwnd)
+        if (wParam == getWindowHandle())
         {
           HCURSOR hCursor;
@@ -2210 +2211 @@
             if( !(getStyle() & WS_MINIMIZE) ) {
                  swp |= MinMaximize(SW_MINIMIZE, &newPos );
+                 fMinMaxChange = TRUE; //-> invalidate entire window in WM_CALCINVALIDRECT
             }
             else swp |= SWP_NOSIZE | SWP_NOMOVE;
@@ -2217 +2219 @@
     case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */
         swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
-        if( !(getStyle() & WS_MAXIMIZE) )
+        if( !(getStyle() & WS_MAXIMIZE) ) {
              swp |= MinMaximize(SW_MAXIMIZE, &newPos );
+             fMinMaxChange = TRUE; //-> invalidate entire window in WM_CALCINVALIDRECT
+        }
         else swp |= SWP_NOSIZE | SWP_NOMOVE;
         break;
@@ -2251 +2255 @@
          if( getStyle() & (WS_MINIMIZE | WS_MAXIMIZE) ) {
               swp |= MinMaximize(SW_RESTORE, &newPos );
+              fMinMaxChange = TRUE; //-> invalidate entire window in WM_CALCINVALIDRECT
          }
          else swp |= SWP_NOSIZE | SWP_NOMOVE;
@@ -2291 +2296 @@
     }
 END:
+    fMinMaxChange = FALSE;
     return wasVisible;
 }