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

Timestamp:

Nov 7, 2001, 4:36:10 PM (24 years ago)

Author:

sandervl

Message:

EndDialog fix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.297 2001-10-28 10:38:13 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.298 2001-11-07 15:36:10 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2471 +2471 @@
         return TRUE;
     }
+
 #if 0
     /* Fix redundant flags */
@@ -2483 +2484 @@
     }
 
-    if(cx < 0) cx = 0;
-    if(cy < 0) cy = 0;
+////    if(cx < 0) cx = 0;
+////    if(cy < 0) cy = 0;
 
     if((rectWindow.right - rectWindow.left == cx) && (rectWindow.bottom - rectWindow.top == cy)) {
@@ -2506 +2507 @@
         }
     }
+    /* TODO: Check hwndInsertAfter */
+
 #endif
 
@@ -2646 +2649 @@
          wpos->y      = rectWindow.top;
     }
-
+   
     WINDOWPOS wpOld = *wpos;
-    SendInternalMessageA(WM_WINDOWPOSCHANGING, 0, (LPARAM)wpos);
+    if(!(wpos->flags & SWP_NOSENDCHANGING))
+        SendInternalMessageA(WM_WINDOWPOSCHANGING, 0, (LPARAM)wpos);
 
     if ((wpos->hwndInsertAfter != wpOld.hwndInsertAfter) ||
@@ -3447 +3451 @@
 
   hwndActive = OSLibWinQueryActiveWindow();
-
   return OS2ToWin32Handle(hwndActive);
 }