Changeset 1391 for trunk/src/user32/pmwindow.cpp

Timestamp:

Oct 21, 1999, 2:19:29 PM (26 years ago)

Author:

sandervl

Message:

wm_adjustwindowpos & combobox fixes

File:

• trunk/src/user32/pmwindow.cpp (modified) (9 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.38 1999-10-20 22:35:53 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.39 1999-10-21 12:19:27 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -253 +253 @@
       WINDOWPOS wp;
       ULONG     parentHeight = 0;
-      HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE;
+      HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE, hwndAfter;
 
         dprintf(("OS2: WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", hwnd, pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
 
-        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
-        if(!win32wnd->CanReceiveSizeMsgs()) break;
+        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) goto RunDefWndProc;;
+
+        //SvL: TODO: Workaround. Why is this happening?
+        //     When this flag is set the coordinates are 0, even though SWP_SIZE & SWP_MOVE are set.
+//        if ((pswp->fl & SWP_NOADJUST)) goto RunDefWndProc;
+
+        if(!win32wnd->CanReceiveSizeMsgs()) goto RunDefWndProc;;
 
         WinQueryWindowPos(hwnd, &swpOld);
@@ -267 +272 @@
                         hParent = win32wnd->getParent()->getOS2WindowHandle();
                 }
-                else    break;
-            }
-        }
+                else    goto RunDefWndProc;;
+            }
+        }
+        hwndAfter = pswp->hwndInsertBehind;
         hFrame = win32wnd->getOS2FrameWindowHandle();
         OSLibMapSWPtoWINDOWPOS(pswp, &wp, &swpOld, hParent, hFrame);
@@ -285 +291 @@
             OSLibMapWINDOWPOStoSWP(&wp, pswp, &swpOld, hParent, hFrame);
             dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
-            //TODO: What should we return here? 0 means no changes, but the AWP flags
-            //      aren't very useful either
+            pswp->fl |= SWP_NOADJUST;
+            pswp->hwndInsertBehind = hwndAfter;
+            pswp->hwnd = hFrame;
+
+            WinSetMultWindowPos(GetThreadHAB(), pswp, 1);
+            return (MRESULT)0;
         }
         break;
@@ -301 +311 @@
       LONG      xDelta = pswp->cx - swpOld.cx;
 
-        dprintf(("OS2: WM_WINDOWPOSCHANGED %x %x (%d,%d) (%d,%d)", hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+        dprintf(("OS2: WM_WINDOWPOSCHANGED (%x) %x %x (%d,%d) (%d,%d)", mp2, hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
@@ -314 +324 @@
             }
         }
-        hFrame = WinQueryWindow(hwnd, QW_PARENT);
-        OSLibMapSWPtoWINDOWPOS(pswp, &wp, &swpOld, hParent, hFrame);
+        OSLibMapSWPtoWINDOWPOS(pswp, &wp, &swpOld, hParent, hwnd);
 
         win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
@@ -388 +397 @@
     }
 
-    case WM_MOVE:
-    {
-        if (!win32wnd->isFrameWindow()) break;
-
-        HWND      hFrame = win32wnd->getOS2FrameWindowHandle();
-        SWP       swp, swpo;
-        WINDOWPOS wp;
-        ULONG     parentHeight = 0;
-        RECTL     rcl;
-
-        WinQueryWindowRect (hwnd, &rcl);
-        WinMapWindowPoints (hwnd, hFrame, (PPOINTL)&rcl, 2);
-        swp.x  = swpo.x  = rcl.xLeft;
-        swp.y  = swpo.y  = rcl.yBottom;
-        swp.cx = swpo.cx = rcl.xRight - rcl.xLeft;
-        swp.cy = swpo.cy = rcl.yTop   - rcl.yBottom;
-        swp.fl = SWP_MOVE | SWP_NOREDRAW;
-        swp.hwnd             = hwnd;
-        swp.hwndInsertBehind = NULLHANDLE;
-        dprintf(("OS2: WM_MOVE %x %x (%d,%d) (%d,%d)", hwnd, swp.fl, swp.x, swp.y, swp.cx, swp.cy));
-
-        OSLibMapSWPtoWINDOWPOS(&swp, &wp, &swpo, NULLHANDLE, hFrame);
-
-        wp.flags &= ~SWP_NOMOVE_W;
-        wp.hwnd = win32wnd->getWindowHandle();
-        win32wnd->setWindowRect(wp.x, wp.y, wp.x + wp.cx, wp.y + wp.cy);
-        win32wnd->setClientRect(swpo.x, swpo.y, swpo.x + swpo.cx, swpo.y + swpo.cy);
-        win32wnd->MsgPosChanged((LPARAM)&wp);
-        break;
-    }
-
     case WM_SIZE:
     {
-        break;
+        dprintf(("OS2: WM_SIZE (%d,%d) (%d,%d)", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), SHORT1FROMMP(mp1), SHORT2FROMMP(mp2)));
+        break;
+    }
+
+    case WM_OWNERPOSCHANGE:
+    {
+        dprintf(("OS2: WM_OWNERPOSCHANGE"));
+        goto RunDefWndProc;
+    }
+
+    case WM_CALCVALIDRECTS:
+    {
+        dprintf(("OS2: WM_CALCVALIDRECTS"));
+        goto RunDefWndProc;
     }
 
@@ -820 +811 @@
             win32wnd->setEraseBkgnd (!erased, !erased);
         }
-
         break;
     }
@@ -853 +843 @@
     case WM_SYSCOLORCHANGE:
     case WM_SYSVALUECHANGED:
-    case WM_CALCVALIDRECTS:
     case WM_SETSELECTION:
     case WM_PPAINT: