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

Timestamp:

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

Author:

dengert

Message:

erase background/paint stuff enhanced

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.3 1999-09-21 08:24:04 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.4 1999-09-21 17:05:36 dengert Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -27 +27 @@
 #include "oslibgdi.h"
 #include "oslibmsg.h"
+#include "dc.h"
 
 HMQ  hmq = 0;                             /* Message queue handle         */
@@ -222 +223 @@
         }
         classStyle = win32wnd->getClass()->getStyle();
-//        if (yDelta != 0)
         if ((yDelta != 0) && ((classStyle & CS_VREDRAW_W) ||
            ((classStyle & CS_HREDRAW_W) && (pswp->cx != pswpo->cx))))
@@ -231 +231 @@
             HWND hwnd;
 
-            dprintf(("move children"));
             while ((hwnd = WinGetNextWindow(henum)) != NULLHANDLE)
             {
 #if 0
-               /* Do not move MDI clients.  MDI clients are a special case,
-                * even though they are bottom aligned they are always supposed
-                * to be the same size as their parent.  This code is an
-                * optimization and will not work correctly if the this
-                * assumption is incorrect.
-                */
-               WinBase *pBase = (WinBase *)WinQueryDAXData( hwnd );
-               if ( pBase && pBase->typeOf() == mdiClient )
+               if (mdiClient )
                {
                   continue;
                }
 #endif
-               // We don't know how many children we have so we'll move ten
-               // at a time.  Not very nice, I know.
                WinQueryWindowPos(hwnd, &(swp[i]));
-
-               // The SWP flags are all set but PM will ignore any
-               // superflous ones, so keep them as they contain useful
-               // minimise and maximise flags.
                swp[i].y += yDelta;
 
@@ -269 +255 @@
             WinEndEnumWindows(henum);
 
-            // Any remaining windows?
             if (i)
                WinSetMultWindowPos(GetThreadHAB(), swp, i);
@@ -280 +265 @@
     case WM_ERASEBACKGROUND:
     {
-        if(win32wnd->MsgEraseBackGround(0)) {
-                goto RunDefWndProc;
+        if (!win32wnd->isSupressErase()) {
+            BOOL erased = sendEraseBkgnd (win32wnd);
+            win32wnd->setEraseBkgnd (!erased, !erased);
         }
         break;
@@ -558 +544 @@
 
     case WM_TIMER:
-        win32wnd->MsgTimer((ULONG)mp1);
+        win32wnd->MsgTimer((ULONG)mp1);
         goto RunDefWndProc;
 
@@ -592 +578 @@
     case WM_PAINT:
         dprintf(("OS2: WM_PAINT %x", hwnd));
+
+        if (WinQueryUpdateRect (hwnd, NULL)) {
+            if (!win32wnd->isSupressErase()) {
+                BOOL erased = sendEraseBkgnd (win32wnd);
+                win32wnd->setEraseBkgnd (!erased, !erased);
+            }
+        }
+        win32wnd->setSupressErase (FALSE);
+
         if(win32wnd->MsgPaint(0, 0)) {
                 goto RunDefWndProc;