X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d325d81bc739bf545df5c00183fc7d5880b8a43..81e2cbc6851553da7a733bbdeb3ab59f4081902c:/src/mac/carbon/button.cpp?ds=sidebyside

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 6c3d6f2649..66f2cfdeff 100644
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -9,28 +9,31 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "button.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/button.h"
 #include "wx/panel.h"
+#include "wx/stockitem.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
 
 #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) )
@@ -39,17 +42,43 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     m_label = label ;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl() ;
-    if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
+    m_peer = new wxMacControl(this) ;
+    if ( id == wxID_HELP )
+    {
+        ControlButtonContentInfo info ;
+        info.contentType = kControlContentIconRef ;
+        GetIconRef(kOnSystemDisk, kSystemIconsCreator, kHelpIcon, &info.u.iconRef);
+        verify_noerr ( CreateRoundButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , kControlRoundButtonNormalSize , 
+            &info , m_peer->GetControlRefAddr() ) );
+    }
+    else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {
-        verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , *m_peer ) );
+#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
     {
         ControlButtonContentInfo info ;
         info.contentType = kControlNoContent ;
         verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""),
-            kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , *m_peer ) );
+            kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
     }
     
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
@@ -77,6 +106,9 @@ void wxButton::SetDefault()
 
 wxSize wxButton::DoGetBestSize() const
 {
+    if ( GetId() == wxID_HELP )
+        return wxSize( 20 , 20 ) ;
+        
     wxSize sz = GetDefaultSize() ;
 
     int charspace = 8 ;
@@ -97,17 +129,16 @@ wxSize wxButton::DoGetBestSize() const
     }
   
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
-    short   baselineoffset ;
-    ::GetBestControlRect( *m_peer , &bestsize , &baselineoffset ) ;
+    m_peer->GetBestRect( &bestsize ) ;
   
-    int wBtn = 0 ;
+    int wBtn;
     if ( EmptyRect( &bestsize ) )
     {
-        int wBtn = m_label.Length() * charspace + 12 ;
+        wBtn = m_label.Length() * charspace + 12 ;
     }
     else
     {
-        sz.x = bestsize.right - bestsize.left ;
+        wBtn = bestsize.right - bestsize.left ;
         sz.y = bestsize.bottom - bestsize.top ;
     }