Changeset 1387 for trunk/src

Timestamp:

Oct 21, 1999, 12:35:54 AM (26 years ago)

Author:

sandervl

Message:

Combobox fixes + scrollbar position fix

Location:

trunk/src/user32

Files:

• combo.cpp (modified) (4 diffs)
• pmwindow.cpp (modified) (2 diffs)
• user32.cpp (modified) (2 diffs)
• window.cpp (modified) (7 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.6 1999-10-20 06:38:08 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.7 1999-10-20 22:35:52 sandervl Exp $ */
 /*
  * Combo controls
@@ -375 +375 @@
   else
   {
+    //SvL: Listbox size might have changed!
+    if(lphc->hWndLBox)
+        GetWindowRect(lphc->hWndLBox, lprLB);
+
     /*
      * Make sure the dropped width is as large as the combobox itself.
@@ -470 +474 @@
   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;
@@ -1546 +1555 @@
 static void COMBO_Size( LPHEADCOMBO lphc )
   {
+  dprintf(("COMBO_Size"));
   CBCalcPlacement(lphc->hwndself,
                   lphc,

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.37 1999-10-20 13:46:26 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.38 1999-10-20 22:35:53 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -911 +911 @@
         HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE;
 
+        dprintf(("OS2Subclass: WM_WINDOWPOSCHANGED %x %x (%d,%d) (%d,%d)", hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
 
-        if(pswp->fl & (SWP_MOVE | SWP_SIZE))
-          hFrame = WinQueryWindow(hwnd, QW_PARENT);
+        hParent = hFrame = WinQueryWindow(hwnd, QW_PARENT);
 
         OSLibMapSWPtoWINDOWPOS(pswp,&wp, &swpOld,hParent,hFrame);
 
-        win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
+        win32wnd->setWindowRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
         win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
+        wp.x = swpOld.x;
+        wp.y = swpOld.y;
+        wp.cx = swpOld.cx;
+        wp.cy = swpOld.cy;
+
+        wp.hwnd = win32wnd->getWindowHandle();
 
         win32wnd->MsgPosChanged((LPARAM)&wp);

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.45 1999-10-20 13:48:07 phaller Exp $ */
+/* $Id: user32.cpp,v 1.46 1999-10-20 22:35:54 sandervl Exp $ */
 
 /*
@@ -2262 +2262 @@
 }
 
-/* Coordinate Space and Transformation Functions */
-
-int WIN32API MapWindowPoints( HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UINT cPoints)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  MapWindowPoints\n");
-#endif
-    hWndFrom = Win32Window::Win32ToOS2Handle(hWndFrom);
-    hWndTo = Win32Window::Win32ToOS2Handle(hWndTo);
-
-    return O32_MapWindowPoints(hWndFrom,hWndTo,lpPoints,cPoints);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API ScreenToClient (HWND hwnd, LPPOINT pt)
-{
-    Win32BaseWindow *wnd;
-    PRECT rcl;
-
-    dprintf(("ScreenToClient %x (%d,%d)\n", hwnd, pt->x, pt->y));
-
-    if (!hwnd) return (TRUE);
-    wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
-    if (!wnd) return (TRUE);
-
-    rcl   = wnd->getClientRect();
-    pt->y = ScreenHeight - pt->y;
-    OSLibWinMapWindowPoints (OSLIB_HWND_DESKTOP, wnd->getOS2WindowHandle(), (OSLIBPOINT *)pt, 1);
-    pt->y = (rcl->bottom - rcl->top) - pt->y;
-    dprintf(("ScreenToClient %x returned (%d,%d)\n", hwnd, pt->x, pt->y));
-    return (TRUE);
-}
-
 /* Icon Functions */
 int WIN32API LookupIconIdFromDirectory(PBYTE presbits, BOOL fIcon)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.21 1999-10-18 11:59:58 sandervl Exp $ */
+/* $Id: window.cpp,v 1.22 1999-10-20 22:35:54 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -318 +318 @@
         return 0;
     }
-    dprintf(("GetParent %x", hwnd));
+//    dprintf(("GetParent %x", hwnd));
     return window->GetParent();
 }
@@ -715 +715 @@
  HWND hwndWin32 = hwnd;
 
-#if 1
  Win32BaseWindow *window;
 
@@ -728 +727 @@
     dprintf(("GetClientRect of %X returned (%d,%d) (%d,%d)\n", hwndWin32, pRect->left, pRect->top, pRect->right, pRect->bottom));
     return TRUE;
-#else
-    hwnd = Win32BaseWindow::Win32ToOS2Handle(hwnd);
-    rc = OSLibWinQueryWindowRect(hwnd, pRect);
-    dprintf(("GetClientRect of %X returned (%d,%d) (%d,%d)\n", hwndWin32, pRect->left, pRect->top, pRect->right, pRect->bottom));
-    return rc;
-#endif
 }
 //******************************************************************************
@@ -747 +740 @@
     dprintf(("AdjustWindowRectEx %x %x %d (%d,%d)(%d,%d)\n", style, exStyle, menu, rect->right, rect->top, rect->left, rect->bottom));
 
-#if 0
-    O32_AdjustWindowRectEx(rect, style, menu, exStyle);
-#else
     /* Correct the window style */
     if (!(style & (WS_POPUP | WS_CHILD)))  /* Overlapped window */
@@ -761 +751 @@
     Win32BaseWindow::NC_AdjustRectOuter( rect, style, menu, exStyle );
     Win32BaseWindow::NC_AdjustRectInner( rect, style, exStyle );
-#endif
 
     dprintf(("AdjustWindowRectEx returned (%d,%d)(%d,%d)\n", rect->right, rect->top, rect->left, rect->bottom));
     return TRUE;
+}
+//******************************************************************************
+/* Coordinate Space and Transformation Functions */
+//******************************************************************************
+int WIN32API MapWindowPoints(HWND hwndFrom, HWND hwndTo, LPPOINT lpPoints,
+                             UINT cPoints)
+{
+ Win32BaseWindow *wndfrom, *wndto;
+ int retval = 0;
+ OSLIBPOINT point;
+
+    if(lpPoints == NULL || cPoints == 0) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+    if(hwndFrom)
+    {
+        wndfrom = Win32BaseWindow::GetWindowFromHandle(hwndFrom);
+        if(!wndfrom) {
+            dprintf(("MapWindowPoints, window %x not found", hwndFrom));
+            SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+            return 0;
+        }
+    }
+    else wndfrom = windowDesktop;
+
+    if(hwndTo)
+    {
+        wndto = Win32BaseWindow::GetWindowFromHandle(hwndTo);
+        if(!wndto) {
+            dprintf(("MapWindowPoints, window %x not found", hwndTo));
+            SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+            return 0;
+        }
+    }
+    else wndto = windowDesktop;
+
+    if(wndto == wndfrom)
+        return 0; //nothing to do
+
+    dprintf(("USER32: MapWindowPoints %x to %x (%d,%d) (%d)", hwndFrom, hwndTo, lpPoints->x, lpPoints->y, cPoints));
+    point.x = lpPoints->x;
+    point.y = wndfrom->getWindowHeight() - lpPoints->y;
+
+    OSLibWinMapWindowPoints(wndfrom->getOS2WindowHandle(), wndto->getOS2WindowHandle(), &point, 1);
+    point.y = wndto->getWindowHeight() - point.y;
+
+    WORD xinc = point.x - lpPoints->x;
+    WORD yinc = point.y - lpPoints->y;
+
+    for(int i=1;i<cPoints;i++)
+    {
+        lpPoints[i].x += xinc;
+        lpPoints[i].y += yinc;
+    }
+    retval = ((DWORD)yinc << 16) | xinc;
+    return retval;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API ScreenToClient (HWND hwnd, LPPOINT pt)
+{
+    Win32BaseWindow *wnd;
+    PRECT rcl;
+
+    dprintf(("ScreenToClient %x (%d,%d)\n", hwnd, pt->x, pt->y));
+
+    if (!hwnd) return (TRUE);
+    wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+    if (!wnd) return (TRUE);
+
+    rcl   = wnd->getClientRect();
+    pt->y = ScreenHeight - pt->y;
+    OSLibWinMapWindowPoints (OSLIB_HWND_DESKTOP, wnd->getOS2WindowHandle(), (OSLIBPOINT *)pt, 1);
+    pt->y = (rcl->bottom - rcl->top) - pt->y;
+    dprintf(("ScreenToClient %x returned (%d,%d)\n", hwnd, pt->x, pt->y));
+    return (TRUE);
 }
 //******************************************************************************
@@ -1280 +1346 @@
 
   if(lpfn == NULL) {
-        dprintf(("EnumChildWindows invalid parameter %x %x\n", hwnd, lParam)); 
+    dprintf(("EnumChildWindows invalid parameter %x %x\n", hwnd, lParam));
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;