wxFont can now raelly use the native fonts

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index e8a9b079b62e2aef6f56e8e6326d68e208356ce2..072ba017205b529ceeeffce85c093c780b1d26d4 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -22,7 +22,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 // Button
 
 
@@ -37,7 +37,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlPushButtonProc , (long) this ) ;
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
        
@@ -50,40 +50,26 @@ void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
     wxButton *btnOldDefault = NULL;
-    wxPanel *panel = wxDynamicCast(parent, wxPanel);
-    if ( panel )
+    if ( parent )
     {
-        btnOldDefault = wxDynamicCast(panel->GetDefaultItem(),
+        btnOldDefault = wxDynamicCast(parent->GetDefaultItem(),
            wxButton);
-        panel->SetDefaultItem(this);
+        parent->SetDefaultItem(this);
     }
 
-#ifdef __DARWIN__
        Boolean inData;
        if ( btnOldDefault && btnOldDefault->m_macControl )
        {
                inData = 0;
-               UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
+               ::SetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
                                                   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
        }
        if ( m_macControl )
        {
                inData = 1;
-               UMASetControlData( m_macControl , kControlButtonPart ,
+               ::SetControlData( m_macControl , kControlButtonPart ,
                                                   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
        }
-#else
-       if ( btnOldDefault && btnOldDefault->m_macControl )
-       {
-               UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)0) ) ;
-       }
-       if ( m_macControl )
-       {
-               UMASetControlData( m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ;
-       }
-#endif
 }
 
 wxSize wxButton::DoGetBestSize() const
@@ -121,8 +107,11 @@ void wxButton::Command (wxCommandEvent & event)
 
 void wxButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
+  if ( controlpart != kControlNoPart )
+  {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
     event.SetEventObject(this);
     ProcessCommand(event);
+  }
 }