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

Timestamp:

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

Author:

sandervl

Message:

Lots of window fixes & changes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.41 1999-10-14 09:22:42 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.42 1999-10-14 18:27:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -454 +454 @@
   dwExStyle = cs->dwExStyle;
 
-  //SvL: Add bordersize
-  cs->cy += 2*borderHeight;
-  cs->cx += 2*borderWidth;
-
   rectWindow.left   = cs->x;
   rectWindow.top    = cs->y;
@@ -489 +485 @@
                                  (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
                                  (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
-                                 &OS2HwndFrame);
+                                 &OS2HwndFrame, 0);
 
   if(OS2Hwnd == 0) {
@@ -548 +544 @@
 #endif
 
+  OSLibWinSetOwner(OS2Hwnd, OS2HwndFrame);
+
   if (dwStyle & WS_HSCROLL)
   {
@@ -585 +583 @@
 
   //Subclass frame
-  if(isFrameWindow() && (HAS_3DFRAME(dwExStyle) ||
-     (!HAS_DLGFRAME(dwStyle, dwExStyle) && (dwStyle & (WS_DLGFRAME|WS_BORDER|WS_THICKFRAME)) == WS_BORDER)))
-  {
+//  if(isFrameWindow() && (HAS_3DFRAME(dwExStyle) ||
+//     (!HAS_DLGFRAME(dwStyle, dwExStyle) && (dwStyle & (WS_DLGFRAME|WS_BORDER|WS_THICKFRAME)) == WS_BORDER)))
+//  {
         pOldFrameProc = FrameSubclassFrameWindow(this);
         if (isChild()) FrameSetBorderSize(this,TRUE);
-  }
+//  }
 
   /* Send the WM_CREATE message
@@ -617 +615 @@
         SendNCCalcSize(FALSE, &rectWindow, NULL, NULL, 0, &rectClient );
 
-        OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
+//        OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
         dprintf(("Sending WM_CREATE"));
         if( (SendMessageA(WM_CREATE, 0, (LPARAM)cs )) != -1 )
@@ -686 +684 @@
 ULONG Win32BaseWindow::MsgShow(BOOL fShow)
 {
+    if(fNoSizeMsg) {
+        return 1;
+    }
+
+    if(fShow) {
+            setStyle(getStyle() | WS_VISIBLE);
+    }
+    else    setStyle(getStyle() & ~WS_VISIBLE);
+
     return SendInternalMessageA(WM_SHOWWINDOW, fShow, 0);
 }
@@ -692 +699 @@
 ULONG Win32BaseWindow::MsgPosChanging(LPARAM lp)
 {
-    dprintf(("MsgPosChanging"));
     if(fNoSizeMsg)
         return 1;
@@ -702 +708 @@
 ULONG Win32BaseWindow::MsgPosChanged(LPARAM lp)
 {
-    dprintf(("MsgPosChanged"));
     if(fNoSizeMsg)
         return 1;
@@ -1969 +1974 @@
    HWND hParent = 0;
 
-   dprintf (("SetWindowPos %x %x (%d,%d)(%d,%d) %x", Win32Hwnd, hwndInsertAfter, x, y, cx, cy, fuFlags));
-
-   if (fuFlags &
+    dprintf (("SetWindowPos %x %x (%d,%d)(%d,%d) %x", Win32Hwnd, hwndInsertAfter, x, y, cx, cy, fuFlags));
+
+    if (fuFlags &
        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |
          SWP_NOREDRAW   | SWP_NOACTIVATE | SWP_FRAMECHANGED |
          SWP_SHOWWINDOW | SWP_HIDEWINDOW | SWP_NOCOPYBITS   |
          SWP_NOOWNERZORDER))
-   {
-      return FALSE;
-   }
-
-   WINDOWPOS wpos;
-   SWP swp, swpOld;
-
-   wpos.flags            = fuFlags;
-   wpos.cy               = cy;
-   wpos.cx               = cx;
-   wpos.x                = x;
-   wpos.y                = y;
-   wpos.hwndInsertAfter  = hwndInsertAfter;
-   wpos.hwnd             = getWindowHandle();
-
-   //SvL: Add bordersize
-   wpos.cy              += 2*borderHeight;
-   wpos.cx              += 2*borderWidth;
-
-   if(~fuFlags & (SWP_NOMOVE | SWP_NOSIZE))
-   {
+    {
+        return FALSE;
+    }
+
+    WINDOWPOS wpos;
+    SWP swp, swpOld;
+
+    wpos.flags            = fuFlags;
+    wpos.cy               = cy;
+    wpos.cx               = cx;
+    wpos.x                = x;
+    wpos.y                = y;
+    wpos.hwndInsertAfter  = hwndInsertAfter;
+    wpos.hwnd             = getWindowHandle();
+
+    if(~fuFlags & (SWP_NOMOVE | SWP_NOSIZE))
+    {
        if (isChild())
        {
@@ -2002 +2003 @@
        }
        OSLibWinQueryWindowPos(OS2HwndFrame, &swpOld);
-   }
-
-   OSLibMapWINDOWPOStoSWP(&wpos, &swp, &swpOld, hParent, OS2HwndFrame);
-   if (swp.fl == 0)
+    }
+
+    OSLibMapWINDOWPOStoSWP(&wpos, &swp, &swpOld, hParent, OS2HwndFrame);
+    if (swp.fl == 0)
       return TRUE;
 
 //   if ((swp.fl & SWPOS_ZORDER) && (swp.hwndInsertBehind > HWNDOS_BOTTOM))
-   if ((swp.hwndInsertBehind > HWNDOS_BOTTOM))
-   {
+    if ((swp.hwndInsertBehind > HWNDOS_BOTTOM))
+    {
         Win32BaseWindow *wndBehind = Win32BaseWindow::GetWindowFromHandle(swp.hwndInsertBehind);
         if(wndBehind) {
@@ -2019 +2020 @@
             swp.hwndInsertBehind = 0;
         }
-   }
+    }
 #if 0
-   if (isFrameWindow())
-   {
+    if (isFrameWindow())
+    {
       if (!isChild())
       {
@@ -2035 +2036 @@
       }
       swp.hwnd = OS2HwndFrame;
-   }
-   else
+    }
+    else
 #endif
       swp.hwnd = OS2HwndFrame;
 
-   dprintf (("WinSetWindowPos %x %x (%d,%d)(%d,%d) %x", swp.hwnd, swp.hwndInsertBehind, swp.x, swp.y, swp.cx, swp.cy, swp.fl));
-
-   rc = OSLibWinSetMultWindowPos(&swp, 1);
-
-   if (rc == FALSE)
-   {
+    dprintf (("WinSetWindowPos %x %x (%d,%d)(%d,%d) %x", swp.hwnd, swp.hwndInsertBehind, swp.x, swp.y, swp.cx, swp.cy, swp.fl));
+
+    rc = OSLibWinSetMultWindowPos(&swp, 1);
+
+    if (rc == FALSE)
+    {
         dprintf(("OSLibWinSetMultWindowPos failed!"));
-   }
-   else
-   {
-      if (fuFlags & SWP_FRAMECHANGED_W)
-         OSLibSendMessage (OS2HwndFrame, 0x42 /*WM_UPDATEFRAME*/, -1, 0);
-   }
-
-   return (rc);
+    }
+    else
+    {
+        if (fuFlags & SWP_FRAMECHANGED_W)
+            OSLibSendMessage (OS2HwndFrame, 0x42 /*WM_UPDATEFRAME*/, -1, 0);
+    }
+
+    return (rc);
 }
 //******************************************************************************
@@ -2061 +2062 @@
 BOOL Win32BaseWindow::DestroyWindow()
 {
-  return OSLibWinDestroyWindow(OS2HwndFrame);
+    return OSLibWinDestroyWindow(OS2HwndFrame);
 }
 //******************************************************************************
@@ -2349 +2350 @@
 BOOL Win32BaseWindow::GetWindowRect(PRECT pRect)
 {
-    return OSLibWinQueryWindowRect(OS2Hwnd, pRect, RELATIVE_TO_SCREEN);
+    return OSLibWinQueryWindowRect(OS2HwndFrame, pRect, RELATIVE_TO_SCREEN);
 }
 //******************************************************************************