From c66ed6682ac09506c994eec7e75515783700ceb8 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 25 Nov 2006 22:48:47 +0000 Subject: [PATCH] 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 --- src/common/combocmn.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index 637c30952b..9430e88cc7 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -1069,6 +1069,23 @@ wxSize wxComboCtrlBase::DoGetBestSize() const 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); -- 2.45.2