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

Timestamp:

May 3, 2000, 8:35:56 PM (25 years ago)

Author:

sandervl

Message:

capture changes/fixes, SetWindowPos fix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.182 2000-05-02 20:50:51 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.183 2000-05-03 18:35:54 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -847 +847 @@
   lastHitTestVal = DispatchMessageA(msg);
 
-  dprintf2(("MsgHitTest (%d,%d) (%d,%d) (%d,%d) returned %x", LOWORD(msg->lParam), HIWORD(msg->lParam), rectWindow.left, rectWindow.right, rectWindow.top, rectWindow.bottom, lastHitTestVal));
+  dprintf2(("MsgHitTest %x (%d,%d) (%d,%d) (%d,%d) returned %x", getWindowHandle(), LOWORD(msg->lParam), HIWORD(msg->lParam), rectWindow.left, rectWindow.right, rectWindow.top, rectWindow.bottom, lastHitTestVal));
 
   if (lastHitTestVal == HTTRANSPARENT)
@@ -2152 +2152 @@
     WINDOWPOS wpos;
     SWP swp, swpOld;
-#if 0 //CB: breaks trackbar tooltip: must call SetWindowPos twice to change the size
-    if(fuFlags & SWP_SHOWWINDOW) {
-        fShow = TRUE;
-        fuFlags &= ~SWP_SHOWWINDOW;
-    }
-    else
-#endif
-    if(fuFlags & SWP_HIDEWINDOW) {
-        fHide = TRUE;
-        fuFlags &= ~SWP_HIDEWINDOW;
-    }
     wpos.flags            = fuFlags;
     wpos.cy               = cy;
@@ -2190 +2179 @@
             FrameUpdateClient(this);
         }
-        if(fHide) {
-            ShowWindow(SW_HIDE);
-        }
-        if(fShow) {
-            ShowWindow(SW_SHOWNA);
+        if(fuFlags & SWP_SHOWWINDOW) {
+                setStyle(getStyle() | WS_VISIBLE);
+        }
+        else
+        if(fuFlags & SWP_HIDEWINDOW) {
+                setStyle(getStyle() & ~WS_VISIBLE);
         }
         return TRUE;
@@ -2215 +2205 @@
     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);
+    if(fuFlags & SWP_SHOWWINDOW && !IsWindowVisible()) {
+        setStyle(getStyle() | WS_VISIBLE);
+    }
+    else
+    if(fuFlags & SWP_HIDEWINDOW && IsWindowVisible()) {
+        setStyle(getStyle() & ~WS_VISIBLE);
     }
     rc = OSLibWinSetMultWindowPos(&swp, 1);
-    if(fShow) {
-        ShowWindow(SW_SHOWNA);
-    }
 
     if (rc == FALSE)
@@ -2649 +2639 @@
   }
   OSLibWinEnableWindow(OS2HwndFrame, fEnable);
+  if(fEnable == FALSE) {
+        //SvL: No need to clear focus as PM already does this
+        if(getWindowHandle() == GetCapture()) {
+                ReleaseCapture();  /* A disabled window can't capture the mouse */
+                dprintf(("Released capture for window %x that is being disabled", getWindowHandle()));
+        }
+  }
   return rc;
 }