Changeset 3341 for trunk/src/user32/win32wbase.cpp

Timestamp:

Apr 7, 2000, 2:55:16 PM (25 years ago)

Author:

sandervl

Message:

clip fix for WM_NCPAINT

File:

• trunk/src/user32/win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.176 2000-03-31 14:42:48 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.177 2000-04-07 12:55:16 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1026 +1026 @@
 
 ////    mapWin32Rect(getParent() ? getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,OS2HwndFrame,&client);
-    if ((rect.left >= client.left) && (rect.left < client.right) &&
-        (rect.right >= client.left) && (rect.right < client.right) &&
-        (rect.top  >= client.top) && (rect.top < client.bottom) &&
-        (rect.bottom >= client.top) && (rect.bottom < client.bottom))
-      return 0;
-
-    dprintf(("MsgNCPaint (%d,%d)(%d,%d)", rect.left, rect.top, rect.right, rect.bottom));
-    hrgn = CreateRectRgnIndirect(&rect);
-    if (!hrgn) return 0;
-    rc = SendInternalMessageA(WM_NCPAINT,hrgn,0);
-    DeleteObject(hrgn);
-
-    return rc;
-  }
-  else return 0;
+        if ((rect.left >= client.left) && (rect.left < client.right) &&
+           (rect.right >= client.left) && (rect.right < client.right) &&
+           (rect.top  >= client.top) && (rect.top < client.bottom) &&
+           (rect.bottom >= client.top) && (rect.bottom < client.bottom))
+        {
+                return 0;
+        }
+
+        dprintf(("MsgNCPaint (%d,%d)(%d,%d)", rect.left, rect.top, rect.right, rect.bottom));
+        hrgn = CreateRectRgnIndirect(&rect);
+        if (!hrgn) return 0;
+
+        rc = SendInternalMessageA(WM_NCPAINT,hrgn,0);
+
+        DeleteObject(hrgn);
+
+        return rc;
+  }
+  else  return 0;
 }
 //******************************************************************************
@@ -1295 +1299 @@
         if ((dwStyle & WS_CAPTION) == WS_CAPTION)
         {
-          HandleNCPaint((HRGN)1);
+//          HandleNCPaint((HRGN)1);
           OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
         }