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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 903b6b5e7c..f00c1297c9 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -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);