X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1fb8167e9d3bb0d62749d58fe6c9a5afc1bd3e3..4d293f8ef41f405a8ea389ac3e00c0e268e4e305:/src/mac/button.cpp?ds=sidebyside

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index e8a9b079b6..19600ac5d7 100644
--- a/src/mac/button.cpp
+++ b/src/mac/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->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
 	  	kControlPushButtonProc , (long) this ) ;
 	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
 	
@@ -58,32 +58,19 @@ void wxButton::SetDefault()
         panel->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