Changeset 2292 for trunk/src/user32/new/window.cpp

Timestamp:

Jan 2, 2000, 8:30:47 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.27 2000-01-01 14:57:34 cbratschi Exp $ */
+/* $Id: window.cpp,v 1.28 2000-01-02 19:30:46 cbratschi Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -768 +768 @@
  Win32BaseWindow *window;
 
+    if (!pRect)
+    {
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return FALSE;
+    }
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
     if(!window) {
         dprintf(("GetClientRect, window %x not found", hwnd));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
-    }
-    *pRect = *window->getClientRect();
-    OffsetRect(pRect, -pRect->left, -pRect->top);
+        return FALSE;
+    }
+    window->getClientRect(pRect);
     dprintf(("GetClientRect of %X returned (%d,%d) (%d,%d)\n", hwndWin32, pRect->left, pRect->top, pRect->right, pRect->bottom));
     return TRUE;
@@ -799 +803 @@
         WS_EX_STATICEDGE | WS_EX_TOOLWINDOW);
     if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME;
-
+#if 0  //CB: todo
     Win32BaseWindow::NC_AdjustRectOuter( rect, style, menu, exStyle );
     Win32BaseWindow::NC_AdjustRectInner( rect, style, exStyle );
-
+#endif
     dprintf(("AdjustWindowRectEx returned (%d,%d)(%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom));
     return TRUE;