Changeset 1297 for trunk/src/user32/oslibgdi.cpp

Timestamp:

Oct 14, 1999, 8:27:59 PM (26 years ago)

Author:

sandervl

Message:

Lots of window fixes & changes

File:

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

trunk/src/user32/oslibgdi.cpp

@@ -1 @@
-/* $Id: oslibgdi.cpp,v 1.2 1999-09-26 10:09:59 sandervl Exp $ */
+/* $Id: oslibgdi.cpp,v 1.3 1999-10-14 18:27:57 sandervl Exp $ */
 /*
  * Window GDI wrapper functions for OS/2
@@ -74 +74 @@
 {
  RECTLOS2 rectParent = {0};
+ Win32BaseWindow *window;
+ LONG height;
 
     if(hwndParent == OSLIB_HWND_DESKTOP) {
@@ -83 +85 @@
     }
 
-    ULONG length = rectOS2->yTop - rectOS2->yBottom;
-
-    rectWin32->bottom = length - rectOS2->yBottom;
-    rectWin32->top    = length - rectOS2->yTop;
+    if(hwndParent != HWND_DESKTOP) 
+    {
+         window = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndParent);
+         if(window == NULL)
+                return FALSE;
+         height = window->getWindowHeight();
+    }
+    else height = OSLibQueryScreenHeight();
+
+    rectWin32->bottom = height - rectOS2->yBottom;
+    rectWin32->top    = height - rectOS2->yTop;
     rectWin32->left   = rectOS2->xLeft;
     rectWin32->right  = rectOS2->xRight;