Changeset 3783 for trunk/src/user32/pmwindow.cpp

Timestamp:

Jul 1, 2000, 11:51:53 AM (25 years ago)

Author:

sandervl

Message:

moving child window when old window smaller than client area & resized

File:

• trunk/src/user32/pmwindow.cpp (modified) (4 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.96 2000-06-29 12:26:00 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.97 2000-07-01 09:51:52 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -339 +339 @@
                 if(pswp->fl & SWP_ACTIVATE)
                 {
-                        WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+                        if(!(WinQueryWindowUShort(hwnd,QWS_FLAGS) & FF_ACTIVE)) {
+                                WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+                        }
                 }
                 goto RunDefWndProc;
@@ -364 +366 @@
         if(pswp->fl & SWP_ACTIVATE)
         {
-             WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+             if(!(WinQueryWindowUShort(hwnd,QWS_FLAGS) & FF_ACTIVE)) {
+                WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+             }
         }
 
@@ -690 +694 @@
 
         rc = WinQueryUpdateRect(hwnd, &rectl);
-        dprintf(("OS2: WM_PAINT (%d,%d) (%d,%d)", rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
+        dprintf(("OS2: WM_PAINT %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
         if(rc && win32wnd->IsWindowCreated() && (rectl.xLeft != rectl.xRight &&
            rectl.yBottom != rectl.yTop))