Changeset 2781 for trunk/src/user32/combo.cpp

Timestamp:

Feb 14, 2000, 6:30:11 PM (26 years ago)

Author:

cbratschi

Message:

merged combobox with core 20000212

File:

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

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.24 2000-01-18 20:10:31 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.25 2000-02-14 17:30:10 cbratschi Exp $ */
 /*
  * Combo controls
@@ -8 +8 @@
  * FIXME: roll up in Netscape 3.01.
  *
- * WINE version: 991212
+ * Corel version: 20000212
+ * (WINE version: 991212)
  *
  * Status:  in progress
@@ -442 +443 @@
 
   if( !CB_GETTYPE(lphc) ) lphc->dwStyle |= CBS_SIMPLE;
-  else if( CB_GETTYPE(lphc) != CBS_DROPDOWNLIST ) lphc->wState |= CBF_EDIT;
+  if( CB_GETTYPE(lphc) != CBS_DROPDOWNLIST ) lphc->wState |= CBF_EDIT;
 
   lphc->hwndself  = hwnd;
@@ -521 +522 @@
       }
       else                                      /* popup listbox */
+      {
         lbeStyle |= WS_POPUP;
+        lbeStyle |= WS_EX_TOOLWINDOW;
+      }
 
      /* Dropdown ComboLBox is not a child window and we cannot pass
@@ -535 +539 @@
                                        lphc->droppedRect.bottom - lphc->droppedRect.top,
                                        lphc->hwndself,
-                       (lphc->dwStyle & CBS_DROPDOWN)? (HMENU)0 : (HMENU)ID_CB_LISTBOX,
+                                       (lphc->dwStyle & CBS_DROPDOWN)? (HMENU)0 : (HMENU)ID_CB_LISTBOX,
                                        GetWindowLongA(lphc->hwndself,GWL_HINSTANCE),
                                        (LPVOID)lphc );
@@ -551 +555 @@
            (CB_GETTYPE(lphc) != CBS_SIMPLE) )
       {
-        SetWindowLongA(lphc->hWndLBox,
-                       GWL_STYLE,
-                       (GetWindowLongA(lphc->hWndLBox, GWL_STYLE) | WS_CHILD) & ~WS_POPUP);
+        /*  Not using SetWindowLongA here because it doesn't allow us to
+         *  change the WS_CHILD style. This code should be equivalent (excluding
+         *  the change in owner) to:
+         *       SetWindowLongA(lphc->hWndLBox, GWL_STYLE,
+         *      (GetWindowLongA(lphc->hWndLBox,GWL_STYLE) | WS_CHILD) & ~WS_POPUP);
+         */
+        STYLESTRUCT style;
+        Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(lphc->hWndLBox);
+
+        if (!win32wnd)
+        {
+          /* Is this the right error? */
+          SetLastError( ERROR_INVALID_WINDOW_HANDLE );
+          return 0;
+        }
+
+        /* save old style, set new style */
+        style.styleOld = win32wnd->getStyle();
+        style.styleNew = (style.styleOld | WS_CHILD) & ~WS_POPUP;
+
+        SendMessageA(lphc->hWndLBox,WM_STYLECHANGING,GWL_STYLE,(LPARAM)&style);
+#if 0 //CB: our code doesn't work with this style change
+        win32wnd->setStyle(style.styleNew);
+#endif
+        SendMessageA(lphc->hWndLBox,WM_STYLECHANGED,GWL_STYLE,(LPARAM)&style);
+
+        /* Set owner to NULL - it seems to be what Windows does to a ComboLBox
+         * after creation.
+         */
+        win32wnd->setOwner(NULL);
       }
 
@@ -1016 +1047 @@
 
    SendMessageA( lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)"" );
+   if( lphc->wState & CBF_FOCUSED )
+     SendMessageA( lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1) );
+
 
    if( pText )
@@ -1033 +1067 @@
    int nHeight;
    int nDroppedHeight,nTempDroppedHeight;
+   int screenH
 
    //TRACE("[%04x]: drop down\n", CB_HWND(lphc));
@@ -1091 +1126 @@
    nDroppedHeight = nTempDroppedHeight;
 
-   SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom,
+   /*If height of dropped rectangle gets beyond a screen size it should go up, otherwise down.*/
+   screenH = GetSystemMetrics(SM_CYSCREEN);
+   if((rect.bottom + nDroppedHeight) >= screenH)
+   {
+     SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.top - nDroppedHeight,
                  lphc->droppedRect.right - lphc->droppedRect.left,
                  nDroppedHeight,
                  SWP_NOACTIVATE | SWP_NOREDRAW);
-
+   }
+   else
+   {
+     SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom,
+                 lphc->droppedRect.right - lphc->droppedRect.left,
+                 nDroppedHeight,
+                 SWP_NOACTIVATE | SWP_NOREDRAW);
+   }
 
    if( !(lphc->wState & CBF_NOREDRAW) )
@@ -1325 +1371 @@
                 }
 
-                CBUpdateLBox( lphc );
+                if (lphc->wState & CBF_NOLBSELECT)
+                {
+                  lphc->wState &= ~CBF_NOLBSELECT;
+                }
+                else
+                {
+                  CBUpdateLBox( lphc );
+                }
                 break;
 
@@ -1357 +1410 @@
                  * by arrowkeys in the dropdown listbox */
 
-                if( (lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP) )
-                     CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE );
+                if( (lphc->dwStyle & CBS_SIMPLE) ||
+                    ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) )
+                {
+                   CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE );
+                }
                 else lphc->wState &= ~CBF_NOROLLUP;
 
@@ -1364 +1420 @@
                 {
                     INT index = SendMessageA(lphc->hWndLBox, LB_GETCURSEL, 0, 0);
+
+                    lphc->wState |= CBF_NOLBSELECT;
                     CBUpdateEdit( lphc, index );
                     /* select text in edit, as Windows does */
@@ -1737 +1795 @@
 }
 
+static LRESULT COMBO_MouseWheel(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  if (wParam & (MK_SHIFT | MK_CONTROL))
+    return DefWindowProcA(hwnd,WM_MOUSEWHEEL,wParam,lParam);
+
+  if ((short) HIWORD(wParam) > 0) return SendMessageA(hwnd,WM_KEYDOWN,VK_UP,0);
+  if ((short) HIWORD(wParam) < 0) return SendMessageA(hwnd,WM_KEYDOWN,VK_DOWN,0);
+
+  return TRUE;
+}
+
 static LRESULT COMBO_Enable(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
@@ -2029 +2098 @@
 
   lParam = SendMessageA( lphc->hWndLBox, LB_SETCURSEL, wParam, 0);
+  if( lParam >= 0 )
+    SendMessageA( lphc->hWndLBox, LB_SETTOPINDEX, wParam, 0);
   if( lphc->wState & CBF_SELCHANGE )
   {
@@ -2213 +2284 @@
         case WM_MOUSEMOVE:
           return COMBO_MouseMove(hwnd,wParam,lParam);
+
+        case WM_MOUSEWHEEL:
+          return COMBO_MouseWheel(hwnd,wParam,lParam);
 
         /* Combo messages */