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

Timestamp:

Sep 21, 1999, 7:05:36 PM (26 years ago)

Author:

dengert

Message:

erase background/paint stuff enhanced

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.2 1999-09-16 18:00:43 dengert Exp $ */
+/* $Id: dc.cpp,v 1.3 1999-09-21 17:03:29 dengert Exp $ */
 
 /*
@@ -739 +739 @@
    pHps->hdcType = TYPE_3;
    lpps->hdc = (HDC)hps;
-   lpps->fErase = !wnd->MsgEraseBackGround(lpps->hdc);
+
+   if (wnd->isEraseBkgnd())
+       wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(lpps->hdc));
+   wnd->setSupressErase (FALSE);
+   lpps->fErase = wnd->isPSErase();
 
    if (!hPS_ownDC)
@@ -1119 +1123 @@
    if (redraw & RDW_UPDATENOW_W) redraw &= ~RDW_ERASENOW_W;
 
+   if (redraw & RDW_NOERASE_W)
+      wnd->setEraseBkgnd (FALSE);
+
+   if (redraw & RDW_UPDATENOW_W)
+      wnd->setSupressErase (FALSE);
+   else if (redraw & RDW_ERASENOW_W)
+      wnd->setSupressErase (FALSE);
 #if 0
-   if (redraw & RDW_NOERASE_W)
-      setEraseBkgnd (FALSE);
-
-   if (redraw & RDW_UPDATENOW_W)
-      setSupressErase (TRUE, FALSE);
-   else if (redraw & RDW_ERASENOW_W)
-      setSupressErase (FALSE, FALSE);
    else
    {
       QMSG qmsg;
-      BOOL bErase;
-
-      bErase = (WinPeekMsg (HABX, &qmsg, hwnd, WM_PAINT, WM_PAINT, PM_REMOVE)
+      BOOL erase;
+
+      erase = (WinPeekMsg (HABX, &qmsg, hwnd, WM_PAINT, WM_PAINT, PM_REMOVE)
                 && (redraw & RDW_NOERASE_W) == 0);
 
-      setSupressErase (FALSE, !bErase);
+      wnd->setSupressErase (!erase);
    }
 
@@ -1186 +1190 @@
    if (redraw & RDW_INVALIDATE_W)
    {
-//      if (redraw & RDW_ERASE_W)
-//         setEraseBkgnd (TRUE, TRUE);
+      if (redraw & RDW_ERASE_W)
+         wnd->setEraseBkgnd (TRUE, TRUE);
 
       if (!pRect && !hrgn)
@@ -1216 +1220 @@
          wnd->MsgPaint (0, FALSE);
 
-//      else if ((redraw & RDW_ERASE_W) && (redraw & RDW_ERASENOW_W))
-//         setEraseBkgnd (FALSE, !sendEraseBkgnd (wnd));
+      else if ((redraw & RDW_ERASE_W) && (redraw & RDW_ERASENOW_W))
+         wnd->setEraseBkgnd (FALSE, !sendEraseBkgnd (wnd));
    }
    else if ((redraw & RDW_INTERNALPAINT_W) && !(redraw & RDW_INVALIDATE_W))
@@ -1235 +1239 @@
       WinReleasePS (hpsTemp);
 
-//   if ((redraw & RDW_INVALIDATE_W) == 0)
-//      setSupressErase (FALSE, FALSE);
-//   else if ((redraw & RDW_ERASENOW_W) == RDW_ERASENOW_W)
-//      setSupressErase (FALSE, TRUE);
+   if ((redraw & RDW_INVALIDATE_W) == 0)
+      wnd->setSupressErase (FALSE);
+   else if ((redraw & RDW_ERASENOW_W) == RDW_ERASENOW_W)
+      wnd->setSupressErase (TRUE);
 
 //   if (!success)