Changeset 2421 for trunk/src/user32/new/pmwindow.cpp

Timestamp:

Jan 12, 2000, 6:37:29 PM (26 years ago)

Author:

cbratschi

Message:

fixed WM_CALCVALIDRECTS, added region for WM_NCPAINT

File:

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

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.36 2000-01-12 12:40:46 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.37 2000-01-12 17:37:29 cbratschi Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -297 +297 @@
     case WM_CALCVALIDRECTS:
     {
-        dprintf(("OS2: WM_CALCVALIDRECTS"));
-        goto RunDefWndProc;
+      PRECTL oldRect = (PRECTL)mp1,newRect = oldRect+1;
+      UINT res = CVR_ALIGNLEFT | CVR_ALIGNTOP;
+
+//CB: todo: use WM_NCCALCSIZE result
+      if (win32wnd->getWindowClass())
+      {
+        DWORD dwStyle = win32wnd->getWindowClass()->getClassLongA(GCL_STYLE_W);
+
+        if ((dwStyle & CS_HREDRAW_W) && (newRect->xRight-newRect->xLeft != oldRect->xRight-oldRect->xLeft))
+          res |= CVR_REDRAW;
+        else if ((dwStyle & CS_VREDRAW_W) && (newRect->yTop-newRect->yBottom != oldRect->yTop-oldRect->yBottom))
+          res |= CVR_REDRAW;
+      } else res |= CVR_REDRAW;
+
+      RestoreOS2TIB();
+      WinDefWindowProc(hwnd,msg,mp1,mp2);
+      RestoreOS2TIB();
+      return (MRESULT)res;
     }