X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49e3e2c25f93dd8114b36155de1756139b7f18b9..dd12ce22d806e6a9c40cf7bdfddbb237cd55b0ca:/src/mac/carbon/button.cpp?ds=sidebyside

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 488ca0496c..28b8697630 100644
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -17,6 +17,7 @@
 
 #include "wx/button.h"
 #include "wx/panel.h"
+#include "wx/stockitem.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
@@ -25,12 +26,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #include "wx/mac/uma.h"
 // Button
 
-bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
+bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
+    wxString label(lbl);
+    if (label.empty() && wxIsStockID(id))
+        label = wxGetStockLabel(id);
+    
     m_macIsUserPane = FALSE ;
     
     if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
@@ -50,6 +55,24 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     }
     else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {
+#if TARGET_API_MAC_OSX
+        //Button height is static in Mac, can't be changed, so we need to force it here
+        if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
+        {
+            bounds.bottom = bounds.top + 20 ;
+            m_maxHeight = 20 ;
+        }
+        else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
+        {
+            bounds.bottom = bounds.top + 17 ;
+            m_maxHeight = 17 ;
+        }
+        else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+        {
+            bounds.bottom = bounds.top + 15 ;
+            m_maxHeight = 15 ;
+        }
+#endif
         verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , m_peer->GetControlRefAddr() ) );
     }
     else