Changeset 2418 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 12, 2000, 4:14:16 PM (26 years ago)

Author:

sandervl

Message:

client positioning + scrollbar fixes

File:

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

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.35 2000-01-12 12:40:47 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.36 2000-01-12 15:14:16 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2028 +2028 @@
     }
 
+    if(IsWindowDestroyed()) {
+        //changing the position of a window that's being destroyed can cause crashes in PMMERGE
+        dprintf(("SetWindowPos; window already destroyed"));
+        return TRUE;
+    }
     WINDOWPOS wpos;
     SWP swp, swpOld;
@@ -2053 +2058 @@
 
     OSLibMapWINDOWPOStoSWP(&wpos, &swp, &swpOld, hParent, OS2HwndFrame);
-    if (swp.fl == 0)
-      return TRUE;
+    if (swp.fl == 0) {
+        if (fuFlags & SWP_FRAMECHANGED)
+        {
+            FrameUpdateClient(this);
+        }
+        return TRUE;
+    }
 
 //   if ((swp.fl & SWPOS_ZORDER) && (swp.hwndInsertBehind > HWNDOS_BOTTOM))
@@ -2098 +2108 @@
     }
 
-    if (fuFlags == SWP_FRAMECHANGED)
-    {
-      //CB: optimize: if frame size has changed not necessary!
-      FrameUpdateFrame(this,0);
+    if(fuFlags & SWP_FRAMECHANGED && (fuFlags & (SWP_NOMOVE | SWP_NOSIZE) == (SWP_NOMOVE | SWP_NOSIZE)))
+    {
+        FrameUpdateClient(this);
     }