fix for (too big) combobox height

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 903b6b5e7caddd3d72a4ced3ae7d0988a6b3e17f..f00c1297c9bdef0ab558fb24ac8a3ac99262d36f 100644 (file)
--- 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());
 
     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;
     int n = GetCount();
     if ( !n )
         n = 10;

+    else if ( n > 10 )
+        n = 10;

 
     height = n * EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
 
 
     height = n * EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);