Changeset 2340 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 6, 2000, 6:05:52 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.22 2000-01-05 21:25:07 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.23 2000-01-06 17:05:52 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -700 +700 @@
   rectWindow.bottom = cs->y+cs->cy;
   rectClient = rectWindow; //dummy client rect
-  MapWindowPoints(getParent() ? getParent()->getWindowHandle():OSLIB_HWND_DESKTOP,0,(PPOINT)&rectWindow,2);
+  if (getParent()) MapWindowPoints(getParent()->getWindowHandle(),0,(PPOINT)&rectWindow,2);
   /* Send the WM_CREATE message
    * Perhaps we shouldn't allow width/height changes as well.
@@ -721 +721 @@
         rectWindow.bottom = cs->y+cs->cy;
         rectClient = rectWindow;
-        MapWindowPoints(getParent() ? getParent()->getWindowHandle():OSLIB_HWND_DESKTOP,0,(PPOINT)&rectWindow,2);
+        if (getParent()) MapWindowPoints(getParent()->getWindowHandle(),0,(PPOINT)&rectWindow,2);
         OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
         //set the window size and update the client
         rect = rectWindow;
-        MapWindowPoints(0,getParent() ? getParent()->getWindowHandle():OSLIB_HWND_DESKTOP,(PPOINT)&rect,2);
+        if (getParent()) MapWindowPoints(0,getParent()->getWindowHandle(),(PPOINT)&rect,2);
         SetWindowPos(hwndLinkAfter,rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top,SWP_NOACTIVATE | SWP_NOREDRAW | SWP_FRAMECHANGED);
         fNoSizeMsg = FALSE;
@@ -1118 +1118 @@
   wndPos.hwndInsertAfter = 0;
   rect = rectWindow;
-  MapWindowPoints(Win32Hwnd,(getParent()) ? getParent()->getWindowHandle():HWND_DESKTOP,(PPOINT)&rect,2);
+  if (getParent()) MapWindowPoints(0,getParent()->getWindowHandle(),(PPOINT)&rect,2);
   wndPos.x = rect.left;
   wndPos.y = rect.top;
@@ -1553 +1553 @@
 
   clientRect = &((NCCALCSIZE_PARAMS*)winRect)->rgrc[2];
-  clientRect->left = 0;
-  clientRect->right = rectWindow.right-rectWindow.left;
-  clientRect->top = 0;
-  clientRect->bottom = rectWindow.bottom-rectWindow.top;
-  mapWin32Rect(OS2HwndFrame,getParent() ? getParent()->getWindowHandle():OSLIB_HWND_DESKTOP,clientRect);
+  *clientRect = rectWindow;
+  if (getParent()) MapWindowPoints(0,getParent()->getOS2WindowHandle(),(PPOINT)clientRect,2);
 
   if(!(dwStyle & WS_MINIMIZE))