fixed warnings after GetFont prototype change

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index d11c858561efeabd10f14af4378b73b43c1928bc..f13104ae68cfcab965f113d46edcd742625de3e7 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -39,9 +39,20 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     m_label = label ;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     m_label = label ;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

-    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, 
-          kControlPushButtonProc , (long) this ) ;
-    wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
+    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 ) );
+    }
+    else
+    {
+        ControlButtonContentInfo info ;
+        info.contentType = kControlNoContent ;
+        verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""),
+            kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , *m_peer ) );
+    }
+    
+    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;

     
     MacPostControlCreate(pos,size) ;
     
     
     MacPostControlCreate(pos,size) ;
     


@@ -59,19 +70,9 @@ void wxButton::SetDefault()
         parent->SetDefaultItem(this);
     }
 
         parent->SetDefaultItem(this);
     }
 

-    Boolean inData;
-    if ( btnOldDefault && btnOldDefault->m_macControl )
-    {
-          inData = 0;
-        ::SetControlData( (ControlRef) btnOldDefault->m_macControl , kControlButtonPart ,
-                           kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
-    }
-    if ( (ControlRef) m_macControl )
-    {
-          inData = 1;
-        ::SetControlData(  (ControlRef) m_macControl , kControlButtonPart ,
-                           kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
-    }
+    if ( btnOldDefault )
+        btnOldDefault->m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ;
+    m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ;

 }
 
 wxSize wxButton::DoGetBestSize() const
 }
 
 wxSize wxButton::DoGetBestSize() const


@@ -97,7 +98,8 @@ wxSize wxButton::DoGetBestSize() const
   
   int wBtn = m_label.Length() * charspace + 12 ;
  
   
   int wBtn = m_label.Length() * charspace + 12 ;
  

-  if (wBtn > sz.x) sz.x = wBtn;
+  if (wBtn > sz.x || ( GetWindowStyle() & wxBU_EXACTFIT) ) 
+    sz.x = wBtn;

   
   return sz ;
 }
   
   return sz ;
 }


@@ -112,23 +114,15 @@ wxSize wxButton::GetDefaultSize()
 
 void wxButton::Command (wxCommandEvent & event)
 {
 
 void wxButton::Command (wxCommandEvent & event)
 {

-    if ( (ControlRef) m_macControl )
-    {
-        HiliteControl(  (ControlRef) m_macControl , kControlButtonPart ) ;
-        unsigned long finalTicks ;
-        Delay( 8 , &finalTicks ) ;
-        HiliteControl(  (ControlRef) m_macControl , 0 ) ;
-    }
+    m_peer->Flash(kControlButtonPart) ;

     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart , bool WXUNUSED(mouseStillDown) ) 
+wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 

 {
 {

-    if ( controlpart != kControlNoPart )
-    {
-        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
-        event.SetEventObject(this);
-        ProcessCommand(event);
-    }
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
+    event.SetEventObject(this);
+    ProcessCommand(event);
+    return noErr ;

 }
 
 }