use sizes from the HIG for the best height of the ComboCtrl on wxMac

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 637c30952bd1d6815ae8ef3bdde503f581c004cf..9430e88cc758451793bb030c27e4027a54e190ef 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1069,6 +1069,23 @@ wxSize wxComboCtrlBase::DoGetBestSize() const
     fhei += 1;
 #endif
 
     fhei += 1;
 #endif
 

+#ifdef __WXMAC__
+    // these are the numbers from the HIG:
+    switch ( m_windowVariant )
+    {
+        case wxWINDOW_VARIANT_NORMAL:
+        default :
+            fhei = 22;
+            break;
+        case wxWINDOW_VARIANT_SMALL:
+            fhei = 19;
+            break;
+        case wxWINDOW_VARIANT_MINI:
+            fhei = 15;
+            break;
+    }
+#endif
+    

     wxSize ret(sizeText.x + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH,
                fhei);
 
     wxSize ret(sizeText.x + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH,
                fhei);