X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11b6a93b1e078fea5bf49ed9e6628a19849c11b3..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/msw/combobox.cpp

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 8d6d7eada7..f00c1297c9 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -96,8 +96,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
   int width = size.x;
   int height = size.y;
 
-  long msStyle = WS_CHILD | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL |
-      CBS_NOINTEGRALHEIGHT;
+  long msStyle = WS_CHILD | WS_TABSTOP | WS_VISIBLE |
+                 WS_VSCROLL | WS_HSCROLL | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT;
 
   if (m_windowStyle & wxCB_READONLY)
     msStyle |= CBS_DROPDOWNLIST;
@@ -332,9 +332,14 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
 
+    // what should the height of the drop down list be? we choose 10 items by
+    // default and also 10 items max (if we always use n, the list will never
+    // have vertical scrollbar)
     int n = GetCount();
     if ( !n )
         n = 10;
+    else if ( n > 10 )
+        n = 10;
 
     height = n * EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);