undoing last change, widgets sample had slider label offset

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 94610153a1358a2bd7661522156c6a2bc62e2a3a..b9dee54353a8e70b9a31fe13af5ce7a18aace334 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -42,14 +42,14 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     m_peer = new wxMacControl() ;
     if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {
-        verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , *m_peer ) );
+        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,30 +77,43 @@ void wxButton::SetDefault()
 
 wxSize wxButton::DoGetBestSize() const
 {
-  wxSize sz = GetDefaultSize() ;
-  
-  int charspace = 8 ;
-  if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
-  {
-    sz.y = 20 ;
-    charspace = 10 ;
-  }
-  else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
-  {
-    sz.y = 17 ;
-    charspace = 8 ;
-  }
-  else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
-  {
-    sz.y = 15 ;
-    charspace = 8 ;
-  }
+    wxSize sz = GetDefaultSize() ;
+
+    int charspace = 8 ;
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
+    {
+        sz.y = 20 ;
+        charspace = 10 ;
+    }
+    else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
+    {
+        sz.y = 17 ;
+        charspace = 8 ;
+    }
+    else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+    {
+        sz.y = 15 ;
+        charspace = 8 ;
+    }
   
-  int wBtn = m_label.Length() * charspace + 12 ;
- 
-  if (wBtn > sz.x) sz.x = wBtn;
+    Rect    bestsize = { 0 , 0 , 0 , 0 } ;
+    m_peer->GetBestRect( &bestsize ) ;
   
-  return sz ;
+    int wBtn;
+    if ( EmptyRect( &bestsize ) )
+    {
+        wBtn = m_label.Length() * charspace + 12 ;
+    }
+    else
+    {
+        wBtn = bestsize.right - bestsize.left ;
+        sz.y = bestsize.bottom - bestsize.top ;
+    }
+    
+    if (wBtn > sz.x || ( GetWindowStyle() & wxBU_EXACTFIT) ) 
+        sz.x = wBtn;
+
+    return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()