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

Timestamp:

May 20, 2000, 4:57:24 PM (25 years ago)

Author:

sandervl

Message:

SetWindowPos & ShowWindow bugfixes (client also updated)

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.190 2000-05-20 13:30:59 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.191 2000-05-20 14:57:24 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2086 +2086 @@
 
     rc = OSLibWinShowWindow(OS2HwndFrame, showstate);
+    OSLibWinShowWindow(OS2Hwnd, showstate);
 
     SendInternalMessageA(WM_SHOWWINDOW, (showstate & SWPOS_SHOW) ? 1 : 0, 0);
@@ -2116 +2117 @@
    Win32BaseWindow *window;
    HWND hParent = 0;
-   BOOL fShow = FALSE, fHide = FALSE;
+   BOOL fShow = FALSE;
 
     if (fuFlags &
@@ -2198 +2199 @@
             FrameUpdateClient(this);
         }
-        if(fuFlags & SWP_SHOWWINDOW) {
-                setStyle(getStyle() | WS_VISIBLE);
-        }
-        else
-        if(fuFlags & SWP_HIDEWINDOW) {
-                setStyle(getStyle() & ~WS_VISIBLE);
-        }
         return TRUE;
     }
@@ -2226 +2220 @@
     if(fuFlags & SWP_SHOWWINDOW && !IsWindowVisible()) {
         setStyle(getStyle() | WS_VISIBLE);
+        //SvL: TODO: Send WM_SHOWWINDOW??
+        OSLibWinShowWindow(OS2Hwnd, SWPOS_SHOW);
     }
     else
     if(fuFlags & SWP_HIDEWINDOW && IsWindowVisible()) {
         setStyle(getStyle() & ~WS_VISIBLE);
+        //SvL: TODO: Send WM_SHOWWINDOW??
+        OSLibWinShowWindow(OS2Hwnd, SWPOS_HIDE);
     }
     rc = OSLibWinSetMultWindowPos(&swp, 1);
 
+#ifdef DEBUG
+    if(fShow) {
+        dprintf(("Frame style 0x%08x, client style 0x%08x", OSLibQueryWindowStyle(OS2HwndFrame), OSLibQueryWindowStyle(OS2Hwnd)));
+    }
+#endif
     if (rc == FALSE)
     {
         dprintf(("OSLibWinSetMultWindowPos failed! Error %x",OSLibWinGetLastError()));
     }
-
     if((fuFlags & SWP_FRAMECHANGED) && (fuFlags & (SWP_NOMOVE | SWP_NOSIZE) == (SWP_NOMOVE | SWP_NOSIZE)))
     {