Implement LBS_COMBOBOX, and make use of it.

Better separation between the Listbox and Combobox. Have a single set of wndprocs, just like Windows.

Implement LBS_COMBOBOX, and make use of it.
134560e9 · Dimitrie O. Paun · Alexandre Julliard · 823c418d · 134560e9 · 134560e9
Commit 134560e9 authored Oct 18, 2004 by Dimitrie O. Paun Committed by Alexandre Julliard Oct 18, 2004
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

combo.c dlls/user/combo.c +2 -1

controls.h dlls/user/controls.h +0 -3

listbox.c dlls/user/listbox.c +0 -0

winuser.h include/winuser.h +1 -0

No files found.
--- a/dlls/user/combo.c
+++ b/dlls/user/combo.c
@@ -70,6 +70,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(combo);
 #define CB_OWNERDRAWN( lphc ) ((lphc)->dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE))
 #define CB_HASSTRINGS( lphc ) ((lphc)->dwStyle & CBS_HASSTRINGS)
 #define CB_HWND( lphc )       ((lphc)->self)
+#define CB_GETTYPE( lphc )    ((lphc)->dwStyle & (CBS_DROPDOWNLIST))

 #define ISWIN31 (LOWORD(GetVersion()) == 0x0a03)

@@ -566,7 +567,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG 

      /* create listbox popup */

-      lbeStyle = (LBS_NOTIFY | WS_BORDER | WS_CLIPSIBLINGS | WS_CHILD) |
+      lbeStyle = (LBS_NOTIFY | LBS_COMBOBOX | WS_BORDER | WS_CLIPSIBLINGS | WS_CHILD) |
                 (style & (WS_VSCROLL | CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE));

      if( lphc->dwStyle & CBS_SORT )

--- a/dlls/user/controls.h
+++ b/dlls/user/controls.h
@@ -113,9 +113,6 @@ typedef struct
   INT            editHeight;     /* explicitly */
 } HEADCOMBO,*LPHEADCOMBO;

-/* Note, that CBS_DROPDOWNLIST style is actually (CBS_SIMPLE | CBS_DROPDOWN) */
-#define CB_GETTYPE( lphc )    ((lphc)->dwStyle & (CBS_DROPDOWNLIST))
-
 extern BOOL COMBO_FlipListbox( LPHEADCOMBO, BOOL, BOOL );

 /* Dialog info structure */

--- a/dlls/user/listbox.c
+++ b/dlls/user/listbox.c
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -2164,6 +2164,7 @@ typedef const SCROLLINFO *LPCSCROLLINFO;
 #define LBS_DISABLENOSCROLL      0x1000
 #define LBS_NODATA               0x2000
 #define LBS_NOSEL                0x4000
+#define LBS_COMBOBOX             0x8000
 #define LBS_STANDARD  (LBS_NOTIFY | LBS_SORT | WS_VSCROLL | WS_BORDER)

 /* Listbox messages */