correcting window variant

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 6c3d6f26494921c5c2c0bb232485ee9da918586f..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)
     {
     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(""),
     }
     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") ) ;
     }
     
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;


@@ -97,17 +97,16 @@ wxSize wxButton::DoGetBestSize() const
     }
   
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     }
   
     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 ) )
     {
     if ( EmptyRect( &bestsize ) )
     {

-        int wBtn = m_label.Length() * charspace + 12 ;
+        wBtn = m_label.Length() * charspace + 12 ;

     }
     else
     {
     }
     else
     {

-        sz.x = bestsize.right - bestsize.left ;
+        wBtn = bestsize.right - bestsize.left ;

         sz.y = bestsize.bottom - bestsize.top ;
     }
     
         sz.y = bestsize.bottom - bestsize.top ;
     }