Changeset 614 for trunk/src

Timestamp:

Aug 22, 1999, 10:30:53 AM (26 years ago)

Author:

sandervl

Message:

Erase background changes

Location:

trunk/src/user32/new

Files:

• pmwindow.cpp (modified) (3 diffs)
• win32class.h (modified) (2 diffs)
• win32wnd.cpp (modified) (3 diffs)
• win32wnd.h (modified) (2 diffs)

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.18 1999-08-16 15:55:28 dengert Exp $ */
+/* $Id: pmwindow.cpp,v 1.19 1999-08-22 08:30:52 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -210 +210 @@
 
         dprintf(("OS2: WM_ERASEBACKGROUND %x", hwnd));
-        hps = WinGetPS(hwnd);
-        if(!win32wnd->MsgEraseBackGround((ULONG)hps))
+        if(!win32wnd->MsgEraseBackGround())
         {
                 /*
@@ -217 +216 @@
                  * in SYSCLR_WINDOW.
                  */
-                WinReleasePS(hps);
                 return (MRESULT)( TRUE );
         }
-        WinReleasePS(hps);
         return (MRESULT) FALSE;
     }

trunk/src/user32/new/win32class.h

@@ -1 @@
-/* $Id: win32class.h,v 1.3 1999-07-20 15:46:53 sandervl Exp $ */
+/* $Id: win32class.h,v 1.4 1999-08-22 08:30:52 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -45 +45 @@
          HICON  getIcon()               { return hIcon; };
 
+        HBRUSH  getBackgroundBrush()    { return backgroundBrush; };
+
           void  setMenuName(LPSTR newMenuName);
 

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.26 1999-08-20 20:09:51 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.27 1999-08-22 08:30:52 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -924 +924 @@
 }
 //******************************************************************************
-//******************************************************************************
-ULONG Win32Window::MsgEraseBackGround(ULONG hps)
+//TODO: Is the clipper region of the window DC equal to the invalidated rectangle?
+//      (or are we simply erasing too much here)
+//******************************************************************************
+ULONG Win32Window::MsgEraseBackGround()
 {
     if(isIcon) {
-            return SendInternalMessageA(WM_ICONERASEBKGND, hps, 0);
-    }
-    else    return SendInternalMessageA(WM_ERASEBKGND, hps, 0);
+            return SendInternalMessageA(WM_ICONERASEBKGND, GetDC(getWindowHandle()), 0);
+    }
+    else    return SendInternalMessageA(WM_ERASEBKGND, GetDC(getWindowHandle()), 0);
 }
 //******************************************************************************
@@ -1033 +1035 @@
     case WM_ERASEBKGND:
     case WM_ICONERASEBKGND:
-        return 0;
+    {
+      RECT rect;
+
+        if (!windowClass->getBackgroundBrush()) return 0;
+
+        /*  Since WM_ERASEBKGND may receive either a window dc or a    */ 
+        /*  client dc, the area to be erased has to be retrieved from  */
+        /*  the device context.                                    */
+        GetClipBox( (HDC)wParam, &rect );
+
+        FillRect( (HDC)wParam, &rect, windowClass->getBackgroundBrush());
+
+        return 1;
+    }
 
     case WM_NCLBUTTONDOWN:

trunk/src/user32/new/win32wnd.h

@@ -1 @@
-/* $Id: win32wnd.h,v 1.22 1999-08-16 15:53:04 dengert Exp $ */
+/* $Id: win32wnd.h,v 1.23 1999-08-22 08:30:53 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -74 +74 @@
          ULONG  MsgMouseMove(ULONG keystate, ULONG x, ULONG y);
          ULONG  MsgPaint(ULONG tmp1, ULONG tmp2);
-         ULONG  MsgEraseBackGround(ULONG hps);
+         ULONG  MsgEraseBackGround();
          ULONG  MsgSetText(LPSTR lpsz, LONG cch);
          ULONG  MsgGetTextLength();