Changeset 715 for trunk/src/user32/new/win32wnd.cpp

Timestamp:

Aug 27, 1999, 7:50:57 PM (26 years ago)

Author:

dengert

Message:

window creation, positioning, sizing

File:

• trunk/src/user32/new/win32wnd.cpp (modified) (8 diffs)

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.30 1999-08-25 15:08:50 dengert Exp $ */
+/* $Id: win32wnd.cpp,v 1.31 1999-08-27 17:50:56 dengert Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -256 +256 @@
   {
         SetParent(cs->hwndParent);
+        owner = GetWindowFromHandle(cs->hwndParent);
+        if(owner == NULL)
+        {
+            dprintf(("HMHandleTranslateToOS2 couldn't find owner window %x!!!", cs->hwndParent));
+            return FALSE;
+        }
   }
   else
@@ -367 +373 @@
   OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
                                  dwOSWinStyle, dwOSFrameStyle, (char *)cs->lpszName,
-                                 (owner) ? owner->getOS2FrameWindowHandle() : OSLIB_HWND_DESKTOP,
+                                 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
                                  (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
                                  &OS2HwndFrame);
@@ -1068 +1074 @@
 
         if (!(wpos->flags & SWP_NOCLIENTMOVE))
-            SendMessageA(WM_MOVE, 0, MAKELONG(wpos->x, wpos->y));
+            SendMessageA(WM_MOVE, 0, MAKELONG(rectClient.left, rectClient.top));
 
         if (!(wpos->flags & SWP_NOCLIENTSIZE))
@@ -1075 +1081 @@
             else if (dwStyle & WS_MINIMIZE) wp = SIZE_MINIMIZED;
 
-            SendMessageA(WM_SIZE, wp, MAKELONG(wpos->cx,wpos->cy));
+           SendMessageA(WM_SIZE, wp, MAKELONG(rectClient.right  - rectClient.left,
+                                              rectClient.bottom - rectClient.top));
         }
         return 0;
@@ -1469 +1476 @@
    BOOL rc = FALSE;
    Win32Window *window;
+   HWND hParent = 0;
 
    dprintf (("SetWindowPos %x %x (%d,%d)(%d,%d) %x", Win32Hwnd, hwndInsertAfter, x, y, cx, cy, fuFlags));
@@ -1484 +1492 @@
    WINDOWPOS wpos;
    SWP swp, swpOld;
-   ULONG parentHeight;
 
    //****************************
@@ -1501 +1508 @@
    //**********************************************
    if(~fuFlags & (SWP_NOMOVE | SWP_NOSIZE)) {
-       OSLibWinQueryWindowPos(OS2Hwnd, &swpOld);
-       parentHeight = isChild() ?
-           OSLibGetWindowHeight(getParent()->getOS2WindowHandle())
-         : OSLibQueryScreenHeight();
+       if (isChild())
+       {
+           hParent = getParent()->getOS2WindowHandle();
+           OSLibWinQueryWindowPos(OS2Hwnd, &swpOld);
+       } else
+           OSLibWinQueryWindowPos(OS2HwndFrame, &swpOld);
    }
-   OSLibMapWINDOWPOStoSWP(&wpos, &swp, &swpOld, parentHeight);
+   OSLibMapWINDOWPOStoSWP(&wpos, &swp, &swpOld, hParent, OS2HwndFrame);
 
    /* MapSWP can clear the SWP_MOVE and SWP_SIZE flags if the window is not