Return smaller images for wxART_MENU/BUTTON under OS X.

[wxWidgets.git] / src / osx / carbon / button.cpp

diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp
index b2f0567d2b4249d706ae0a579d9cd01d76d26582..ea77565438ec6650021bb88c0f863d26711c1f4c 100644 (file)
--- a/src/osx/carbon/button.cpp
+++ b/src/osx/carbon/button.cpp
@@ -66,13 +66,13 @@ wxSize wxButton::DoGetBestSize() const
         OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
         verify_noerr( err );
 
-        // GetThemeTextDimensions will cache strings and the documentation 
-        // says not to use the NoCopy string creation calls. 
-        // This also means that we can't use CFSTR without 
-        // -fno-constant-cfstrings if the library might be unloaded, 
-        // as GetThemeTextDimensions may cache a pointer to our 
-        // unloaded segment. 
-        wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "), 
+        // GetThemeTextDimensions will cache strings and the documentation
+        // says not to use the NoCopy string creation calls.
+        // This also means that we can't use CFSTR without
+        // -fno-constant-cfstrings if the library might be unloaded,
+        // as GetThemeTextDimensions may cache a pointer to our
+        // unloaded segment.
+        wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "),
                           GetFont().GetEncoding() );
 
 #if wxOSX_USE_ATSU_TEXT
@@ -155,6 +155,7 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
                 break;
             case wxWINDOW_VARIANT_SMALL:
                 maxHeight = 17;
+                break;
             case wxWINDOW_VARIANT_MINI:
                 maxHeight = 15;
         }