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

Timestamp:

Jun 8, 2000, 8:10:12 PM (25 years ago)

Author:

sandervl

Message:

lots of fixes + changes (see ChangeLog)

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.199 2000-06-07 21:45:50 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.200 2000-06-08 18:10:11 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -716 +716 @@
             }
 
-            if (cs->style & WS_VISIBLE) ShowWindow(sw);
+            if(cs->style & WS_VISIBLE) {
+                dwStyle &= ~WS_VISIBLE;
+                ShowWindow(sw);
+            }
 
             /* Call WH_SHELL hook */
@@ -2238 +2241 @@
                 MsgFormatFrame(NULL);
                 UnionRect(&oldClientRect, &oldClientRect, &rectClient);
+                OffsetRect(&oldClientRect, -rectClient.left, -rectClient.top);
                 InvalidateRect(getWindowHandle(), &oldClientRect, TRUE);
 //TODO: move child windows!!
@@ -2284 +2288 @@
     {
         UnionRect(&oldClientRect, &oldClientRect, &rectClient);
+        OffsetRect(&oldClientRect, -rectClient.left, -rectClient.top);
         InvalidateRect(getWindowHandle(), &oldClientRect, TRUE);
 //TODO: move child windows!!
@@ -2498 +2503 @@
 HWND Win32BaseWindow::GetTopWindow()
 {
-    return GetWindow(GW_CHILD);
+ HWND             hwndTop;
+ Win32BaseWindow *topwindow;
+
+    hwndTop = OSLibWinQueryWindow(getOS2WindowHandle(), QWOS_TOP);
+    if(!isDesktopWindow()) {
+        topwindow = GetWindowFromOS2Handle(hwndTop);
+        if(topwindow) {
+                return topwindow->getWindowHandle();
+        }
+        return 0;       
+    }
+    while(hwndTop) {
+        topwindow = GetWindowFromOS2Handle(hwndTop);
+        if(topwindow) {
+                return topwindow->getWindowHandle();
+        }
+        hwndTop = OSLibWinQueryWindow(hwndTop, QWOS_NEXT);
+    }
+
+    return 0;
 }
 //******************************************************************************