Changeset 1256 for trunk/src/user32/window.cpp

Timestamp:

Oct 12, 1999, 4:47:24 PM (26 years ago)

Author:

sandervl

Message:

MDI fix, extra message support etc

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.13 1999-10-11 20:54:26 sandervl Exp $ */
+/* $Id: window.cpp,v 1.14 1999-10-12 14:47:24 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -179 +179 @@
         window = (Win32BaseWindow *) new Win32MDIClientWindow(&cs, classAtom, TRUE);
     }
+    else
     if(!lstrcmpiW(className, (LPWSTR)DIALOG_CLASS_NAMEW)) 
     {
@@ -739 +740 @@
 {
  BOOL rc;
-
-#if 1
+ HWND hwndWin32 = hwnd;
+
     hwnd = Win32BaseWindow::Win32ToOS2Handle(hwnd);
     rc = OSLibWinQueryWindowRect(hwnd, pRect);
-    dprintf(("USER32:  GetClientRect of %X returned (%d,%d) (%d,%d)\n", hwnd, pRect->left, pRect->top, pRect->right, pRect->bottom));
+    dprintf(("GetClientRect of %X returned (%d,%d) (%d,%d)\n", hwndWin32, pRect->left, pRect->top, pRect->right, pRect->bottom));
     return rc;
-#else
-   Win32BaseWindow *window;
-
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        dprintf(("GetClientRect, window %x not found", hwnd));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
-    }
-    *pRect = *window->getClientRect();
-    dprintf(("GetClientRect of %X returned (%d,%d) (%d,%d)\n", hwnd, pRect->left, pRect->top, pRect->right, pRect->bottom));
-    return TRUE;
-#endif
 }
 //******************************************************************************