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

Timestamp:

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

Author:

sandervl

Message:

mdi fix + ShowOwnedPopups implemented

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.73 2000-10-08 14:09:40 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.74 2000-10-09 17:26:47 sandervl Exp $ */
 
 /*
@@ -330 +330 @@
    pHps->isClient = FALSE;
 
+#ifdef DEBUG
    GreGetDCOrigin(pHps->hps, &point);
+#endif
 
    if(pHps->isClientArea)
@@ -399 +401 @@
         rcl.yTop    += rcltemp.yBottom;
         rcl.yBottom += rcltemp.yBottom;
-   }
-   pHps->ptlOrigin.x = rcltemp.xLeft;
-   pHps->ptlOrigin.y = rcltemp.yBottom;
+
+        pHps->ptlOrigin.x = rcltemp.xLeft;
+        pHps->ptlOrigin.y = rcltemp.yBottom;
+   }
  
    dprintf2(("selectClientArea %x: (%d,%d) -> (%d,%d)", window->getWindowHandle(), rcltemp.xLeft, rcltemp.yBottom, rcl.xLeft, rcl.yBottom));
@@ -616 +619 @@
         dprintf (("USER32: WARNING: WinQueryUpdateRect failed (error or no update rectangle)!!"));
 
-        selectClientArea(wnd, pHps);
-
         HRGN hrgnClip = GpiCreateRegion(pHps->hps, 1, &rectl);
         GpiSetClipRegion(pHps->hps, hrgnClip, &hrgnOldClip);
+
+        selectClientArea(wnd, pHps);
 
         //save old clip region (restored for CS_OWNDC windows in EndPaint)
@@ -669 +672 @@
    WinShowTrackRect(wnd->getOS2WindowHandle(), FALSE);
 
+#ifdef DEBUG
+   POINTL point;
+   GreGetDCOrigin(pHps->hps, &point);
+   dprintf(("dc origin (%d,%d)", point.x, point.y));
+#endif
+
    if(wnd->needsEraseBkgnd() && lComplexity != RGN_NULL) {
         wnd->setEraseBkgnd(FALSE);
@@ -674 +683 @@
    }
    else lpps->fErase = TRUE;
+
+#ifdef DEBUG
+   GreGetDCOrigin(pHps->hps, &point);
+   dprintf(("dc origin (%d,%d)", point.x, point.y));
+#endif
 
    lpps->hdc    = (HDC)pHps->hps;