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

Timestamp:

Oct 9, 2000, 7:26:55 PM (25 years ago)

Author:

sandervl

Message:

mdi fix + ShowOwnedPopups implemented

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.104 2000-10-04 19:35:31 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.105 2000-10-09 17:26:50 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -839 +839 @@
         rc = WinQueryUpdateRect(hwnd, &rectl);
         dprintf(("OS2: WM_PAINT %x (%d,%d) (%d,%d) rc=%d", win32wnd->getWindowHandle(), rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop, rc));
+
         if(rc && win32wnd->IsWindowCreated() && (rectl.xLeft != rectl.xRight &&
            rectl.yBottom != rectl.yTop)) 
@@ -1009 +1010 @@
   TRACKINFO track;
   RECTL     rcl;
-  PRECT     pWindowRect;
+  PRECT     pWindowRect, pClientRect;
   HWND      hwndTracking;
   HPS       hpsTrack;
@@ -1036 +1037 @@
    }
 
-   rcl.xLeft   = pWindowRect->left;
-   rcl.yTop    = OSLibQueryScreenHeight() - pWindowRect->top;
-   rcl.xRight  = pWindowRect->right;
-   rcl.yBottom = OSLibQueryScreenHeight() - pWindowRect->bottom;
-   if(hwndTracking != HWND_DESKTOP) {
-        WinMapWindowPoints(win32wnd->getOS2WindowHandle(), HWND_DESKTOP, (PPOINTL)&rcl, 2);
-   }
-   WinCopyRect(hab, &track.rclTrack, &rcl);   /* starting point */
- 
-   WinSetRect(hab, &track.rclBoundary, 0, 0, parentWidth, parentHeight); /* bounding rectangle */
- 
+   mapWin32ToOS2Rect(parentHeight, pWindowRect, (PRECTLOS2)&track.rclTrack);
+   WinQueryWindowRect(hwndTracking, &track.rclBoundary);
+
    track.ptlMinTrackSize.x = 10;
    track.ptlMinTrackSize.y = 10;  /* set smallest allowed size of rectangle */
@@ -1056 +1049 @@
    track.fs = flags;
  
-   if(WinTrackRect(HWND_DESKTOP, NULL, &track) )
+   if(WinTrackRect(hwndTracking, NULL, &track) )
    {
         if(hpsTrack)    WinReleasePS(hpsTrack);