Changeset 2569 for trunk/src

Timestamp:

Jan 29, 2000, 9:46:52 PM (26 years ago)

Author:

sandervl

Message:

SetWindowPos, UpdateWindow & WS_VISIBLE fixes/changes

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.39 2000-01-29 14:23:32 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.40 2000-01-29 20:46:52 sandervl Exp $ */
 
 /*
@@ -847 +847 @@
 BOOL WIN32API UpdateWindow (HWND hwnd)
 {
-   if (!hwnd)
-       return FALSE;
-
-   Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
-
-   dprintf (("User32: UpdateWindow hwnd %x -> wnd %x", hwnd, wnd));
-
-#if 0
-   if (WinQueryUpdateRect (wnd->getOS2WindowHandle(), NULL))
-       sendEraseBkgnd (wnd);
-#endif
-
-   WinUpdateWindow(wnd->getOS2FrameWindowHandle());
+  Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+
+   if(!wnd) {
+        O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+   }
+
+   dprintf (("User32: UpdateWindow hwnd %x", hwnd));
+
+   //SvL: Should update client window, not the frame
+   WinUpdateWindow(wnd->getOS2WindowHandle());
 
    return (TRUE);

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.64 2000-01-26 18:02:34 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.65 2000-01-29 20:46:52 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -68 +68 @@
   ULONG dwClientStyle = 0;
   ULONG dwFrameStyle = 0;
-#if 1
 
   BOOL TopLevel = hwndParent == HWND_DESKTOP;
@@ -100 +99 @@
   dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
   return 0;
-#else
-        dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP);
-
-        dwFrameStyle |= FCF_NOBYTEALIGN;
-        if ((hwndParent == HWND_DESKTOP) && (dwFrameStyle & FCF_TITLEBAR))
-                dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
-
-        dwWinStyle   &= ~WS_CLIPCHILDREN;
-
-        *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
-                                       &dwFrameStyle, WIN32_STDCLASS,
-                                       "", dwClientStyle, 0, id, &hwndClient);
-        if(*hwndFrame) {
-                if(pszName) {
-                        WinSetWindowText(*hwndFrame, pszName);
-                }
-                return hwndClient;
-        }
-        dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
-        return 0;
-#endif
 }
 //******************************************************************************
@@ -135 +113 @@
         *OSWinStyle |= WS_MINIMIZED;
 //Done explicitely in CreateWindowExA
-#if 1
+#if 0
   if(dwStyle & WS_VISIBLE_W)
         *OSWinStyle |= WS_VISIBLE;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.148 2000-01-28 22:26:00 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.149 2000-01-29 20:46:52 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2049 +2049 @@
    Win32BaseWindow *window;
    HWND hParent = 0;
+   BOOL fShow = FALSE, fHide = FALSE;
 
     if (fuFlags &
@@ -2086 +2087 @@
 #endif
 
+    if(fuFlags & SWP_SHOWWINDOW) {
+        fShow = TRUE;
+        fuFlags &= ~SWP_SHOWWINDOW;
+    }
+    else
+    if(fuFlags & SWP_HIDEWINDOW) {
+        fHide = TRUE;
+        fuFlags &= ~SWP_HIDEWINDOW;
+    }
     wpos.flags            = fuFlags;
     wpos.cy               = cy;
@@ -2132 +2142 @@
     dprintf (("WinSetWindowPos %x %x (%d,%d)(%d,%d) %x", swp.hwnd, swp.hwndInsertBehind, swp.x, swp.y, swp.cx, swp.cy, swp.fl));
 
+    //SvL: For some reason WinSetMultWindowPos doesn't work for showing windows when they are hidden..
+    if(fHide) {
+        ShowWindow(SW_HIDE);
+    }
     rc = OSLibWinSetMultWindowPos(&swp, 1);
+    if(fShow) {
+        ShowWindow(SW_SHOWNA);
+    }
 
     if (rc == FALSE)