Changeset 1391 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

wm_adjustwindowpos & combobox fixes

Location:

trunk/src/user32

Files:

• combo.cpp (modified) (5 diffs)
• oslibwin.cpp (modified) (4 diffs)
• pmwindow.cpp (modified) (9 diffs)
• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbasepos.cpp (modified) (3 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.7 1999-10-20 22:35:52 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.8 1999-10-21 12:19:26 sandervl Exp $ */
 /*
  * Combo controls
@@ -165 +165 @@
 {
   RECT windowRect;
+
+  //SvL: Doesn't work for us
+  return;
 
   GetWindowRect(CB_HWND(lphc), &windowRect);
@@ -181 +184 @@
                 windowRect.right  - windowRect.left,
                 windowRect.bottom - windowRect.top +
-                  lphc->droppedRect.bottom - lphc->droppedRect.top,
+                lphc->droppedRect.bottom - lphc->droppedRect.top,
                 SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE );
 }
@@ -431 +434 @@
   WINDOWPOS*  posChanging)
 {
+  dprintf(("COMBO_WindowPosChanging"));
+
   /*
    * We need to override the WM_WINDOWPOSCHANGING method to handle all
@@ -474 +479 @@
   LPCREATESTRUCTA  lpcs = (CREATESTRUCTA*)lParam;
 
-//testestest
-#if 1
-  lphc->dwStyle |= CBS_SIMPLE;
-#else
   if( !CB_GETTYPE(lphc) ) lphc->dwStyle |= CBS_SIMPLE;
   else if( CB_GETTYPE(lphc) != CBS_DROPDOWNLIST ) lphc->wState |= CBF_EDIT;
-#endif
 
   lphc->hwndself  = hwnd;

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.32 1999-10-20 13:46:26 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.33 1999-10-21 12:19:26 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -486 +486 @@
    HWND   hWinAfter;
    ULONG  flags = 0;
-   SWP    swpFrame;
+   SWP    swpFrame, swpClient;
    POINTL point;
 
@@ -508 +508 @@
     if (  fuFlags & SWP_SHOW)        flags |= SWP_SHOWWINDOW_W;
     if (  fuFlags & SWP_HIDE)        flags |= SWP_HIDEWINDOW_W;
+    if (  fuFlags & SWP_NOADJUST)    flags |= SWP_NOSENDCHANGING_W;
 
     WinQueryWindowPos(hFrame, &swpFrame);
+
+    if ( fuFlags & SWP_NOADJUST) {
+        WinQueryWindowPos(WinWindowFromID(hFrame, FID_CLIENT), &swpClient);
+        x  = swpClient.x;
+        cx = swpClient.cx;
+        y  = swpClient.y;
+        cy = swpClient.cy;
+    }
 
     if(fuFlags & (SWP_MOVE | SWP_SIZE))
@@ -596 +605 @@
    if (  fuFlags & SWP_SHOWWINDOW_W)  flags |= SWP_SHOW;
    if (  fuFlags & SWP_HIDEWINDOW_W)  flags |= SWP_HIDE;
+   if (  fuFlags & SWP_NOSENDCHANGING_W) flags |= SWP_NOADJUST;
 
    if (flags & (SWP_MOVE | SWP_SIZE))

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:

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.18 1999-10-17 20:18:45 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.19 1999-10-21 12:19:27 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -20 +20 @@
 #include "oslibmsg.h"
 #include "win32wdesktop.h"
+#include "controls.h"
 
 #define DEFAULT_DLGFONT "9.WarpSans"
@@ -770 +771 @@
         if (hwndCurFocus)
         {
-#if 0
-            WND *wnd = WIN_FindWndPtr( hwndFocus );
-
-            if( wnd )
+            Win32BaseWindow *wndFocus = Win32BaseWindow::GetWindowFromHandle(hwndFocus);
+
+            if(wndFocus)
             {
                 /* always make combo box hide its listbox control */
-                if( WIDGETS_IsControl( wnd, BIC32_COMBO ) )
-                    SendMessageA( hwndFocus, CB_SHOWDROPDOWN, FALSE, 0 );
+                if( WIDGETS_IsControl( wndFocus, COMBOBOX_CONTROL ) )
+                    wndFocus->SendMessageA(CB_SHOWDROPDOWN, FALSE, 0 );
                 else
-                if( WIDGETS_IsControl( wnd, BIC32_EDIT ) &&
-                    WIDGETS_IsControl( wnd->parent, BIC32_COMBO ))
-                    SendMessageA(CB_SHOWDROPDOWN, FALSE, 0 );
+                if( WIDGETS_IsControl( wndFocus, EDIT_CONTROL ) &&
+                    WIDGETS_IsControl( wndFocus->getParent(), COMBOBOX_CONTROL ))
+                    wndFocus->SendMessageA(CB_SHOWDROPDOWN, FALSE, 0 );
             }
-#endif
         }
         return DefWindowProcA( msg, wParam, lParam );

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.57 1999-10-20 13:46:27 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.58 1999-10-21 12:19:28 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -675 +675 @@
 
 //        OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
-        dprintf(("Sending WM_CREATE"));
         if( (SendMessageA(WM_CREATE, 0, (LPARAM)cs )) != -1 )
         {

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.4 1999-10-20 13:46:28 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.5 1999-10-21 12:19:29 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -426 +426 @@
 {
  POINT maxSize, minTrack;
+ int   rc = 1;
 
     if (winpos->flags & SWP_NOSIZE)
@@ -431 +432 @@
 
     if ((getStyle() & WS_THICKFRAME) ||
-            ((getStyle() & (WS_POPUP | WS_CHILD)) == 0))
-    {
-            GetMinMaxInfo(&maxSize, NULL, &minTrack, NULL );
-            if (maxSize.x < winpos->cx) winpos->cx = maxSize.x;
-            if (maxSize.y < winpos->cy) winpos->cy = maxSize.y;
-            if (!(getStyle() & WS_MINIMIZE))
-            {
-            if (winpos->cx < minTrack.x ) winpos->cx = minTrack.x;
-            if (winpos->cy < minTrack.y ) winpos->cy = minTrack.y;
-        }
-        return 0;
+        ((getStyle() & (WS_POPUP | WS_CHILD)) == 0))
+    {
+        GetMinMaxInfo(&maxSize, NULL, &minTrack, NULL );
+        if (maxSize.x < winpos->cx) {
+            winpos->cx = maxSize.x;
+            rc = 0;
+        }
+        if (maxSize.y < winpos->cy) {
+            winpos->cy = maxSize.y;
+            rc = 0;
+        }
+        if (!(getStyle() & WS_MINIMIZE))
+        {
+            if (winpos->cx < minTrack.x ) {
+                winpos->cx = minTrack.x;
+                rc = 0;
+            }
+            if (winpos->cy < minTrack.y ) {
+                winpos->cy = minTrack.y;
+                rc = 0;
+            }
+        }
     }
-    return 1;
+    return rc;
 }
 //******************************************************************************