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

Timestamp:

Dec 7, 1999, 7:19:47 PM (26 years ago)

Author:

sandervl

Message:

Removed all remove/selectClientArea calls

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.25 1999-12-07 12:26:58 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.26 1999-12-07 18:19:47 sandervl Exp $ */
 
 /*
@@ -358 +358 @@
 }
 
-VOID removeClientArea(pDCData pHps)
-{
-   pHps->isClient = FALSE;
-
-   if (pHps->isClientArea)
-   {
-      pHps->isClientArea = FALSE;
-      GreSetupDC(pHps->hps,
-                 pHps->hrgnVis,
-                 pHps->ptlOrigin.x,
-                 pHps->ptlOrigin.y,
-                 0,
-                 SETUPDC_ORIGIN | SETUPDC_VISRGN | SETUPDC_RECALCCLIP);
-   }
-}
-
-BOOL selectClientArea(Win32BaseWindow *wnd, pDCData pHps, PRECTL prclPaint)
-{
-   RECTL rcl;
-   HRGN hrgnRect;
-   HWND hwnd;
-
-   if (!wnd) return (FALSE);
-
-   pHps->isClient = TRUE;
-   hwnd = pHps->hwnd;
-
-   rcl.xLeft  = rcl.yBottom = 0;
-   rcl.xRight = wnd->getWindowWidth();
-   rcl.yTop   = wnd->getWindowHeight();
-
-   WinMapWindowPoints(hwnd, HWND_DESKTOP, (PPOINTL) &rcl, 2);
-   pHps->ptlOrigin = *((PPOINTL) &rcl);
-
-   if (pHps->hrgnVis == 0)
-      pHps->hrgnVis = GreCreateRectRegion(pHps->hps, &rcl, 1);
-
-   hrgnRect = GreCreateRectRegion(pHps->hps, &rcl, 1);
-
-   if (!pHps->isClientArea)
-      GreCopyClipRegion(pHps->hps, pHps->hrgnVis, 0, COPYCRGN_VISRGN);
-
-   GreCombineRegion(pHps->hps, hrgnRect, pHps->hrgnVis, hrgnRect, CRGN_AND);
-   GreSetupDC(pHps->hps,
-              hrgnRect,
-              rcl.xLeft,
-              rcl.yBottom,
-              prclPaint,
-              SETUPDC_ORIGIN | SETUPDC_VISRGN | SETUPDC_RECALCCLIP);
-
-   pHps->isClientArea = TRUE;
-   GreDestroyRegion(pHps->hps, hrgnRect);
-
-   return (TRUE);
-}
-
 HDC sendEraseBkgnd (Win32BaseWindow *wnd)
 {
@@ -512 +456 @@
    }
 
-//   if (wnd->isFrameWindow())
-//   {
-//      WinSendMsg( hwnd, /* WM_DRAW */ 0x20D, (MPARAM)hps, MPVOID );
-      //CB: subclassed window haven't got a frame
-//      if (!wnd->isSubclassedOS2Wnd()) selectClientArea(wnd, pHps, &rect);
-//   }
-
    if (hPS_ownDC == 0)
       setMapMode (wnd, pHps, MM_TEXT_W);
@@ -567 +504 @@
        if (pHps && (pHps->hdcType == TYPE_3))
        {
-           removeClientArea (pHps);
           WinEndPaint (pHps->hps);
        }
@@ -688 +624 @@
             goto error;
 
-         if (flags & DCX_WINDOW_W)
-            removeClientArea (pHps);
-         else
-            selectClientArea (wnd, pHps, 0);
-
          setPageXForm (wnd, pHps);
 
@@ -725 +656 @@
    HPSToHDC (hWindow, hps, NULL, NULL);
    pHps = (pDCData)GpiQueryDCData (hps);
-
-   if (!(flags & DCX_WINDOW_W)) {
-      if (selectClientArea (wnd, pHps, 0))
-         setMapMode (wnd, pHps, MM_TEXT_W);
-   }
 
    if ((flags & DCX_EXCLUDERGN_W) || (flags & DCX_INTERSECTRGN_W))