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

Timestamp:

Jan 14, 2001, 6:15:47 PM (25 years ago)

Author:

sandervl

Message:

listbox, combobox and notifyframe fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.228 2000-12-29 18:39:59 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.229 2001-01-14 17:15:47 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2221 +2221 @@
    RECT oldClientRect = rectClient;
 
+    if(getWindowHandle() == 0x68000010) {
+        hParent = 0;
+    }
     if (fuFlags &
        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |
@@ -2385 +2388 @@
 
     MsgFormatFrame(NULL);
+
     if(RECT_WIDTH(rectClient) != RECT_WIDTH(*oldClientRect) ||
        RECT_HEIGHT(rectClient) != RECT_HEIGHT(*oldClientRect))
     {
-         wpos->flags &= ~SWP_NOSIZE;
+         wpos->flags &= ~(SWP_NOSIZE|SWP_NOCLIENTSIZE);
+         wpos->cx     = RECT_WIDTH(rectWindow);
+         wpos->cy     = RECT_HEIGHT(rectWindow);
+    }
+
+    if(rectClient.left != oldClientRect->left || 
+       rectClient.top != oldClientRect->top)
+    {
+         wpos->flags &= ~(SWP_NOMOVE|SWP_NOCLIENTMOVE);
+         wpos->x      = rectWindow.left;
+         wpos->y      = rectWindow.top;
     }