X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5c6eb5c178b44f4400495e06274ffd130635190..c5c9378c98eb13fc214acb01cd66deec6913fa43:/src/mac/carbon/button.cpp

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 363789a945..d85d8bf7be 100644
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -22,9 +22,11 @@
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 // Button
 
+static const int kMacOSXHorizontalBorder = 1 ;
+static const int kMacOSXVerticalBorder = 1 ;
 
 bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,
@@ -34,15 +36,21 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 {
 	Rect bounds ;
 	Str255 title ;
+
+    if ( UMAHasAquaLayout() )
+    {
+        m_macHorizontalBorder = kMacOSXHorizontalBorder;
+        m_macVerticalBorder = kMacOSXVerticalBorder;
+    }
 	
 	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( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
 	  	kControlPushButtonProc , (long) this ) ;
-	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+	wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
 	
 	MacPostControlCreate() ;
-
+	
   return TRUE;
 }
 
@@ -50,78 +58,72 @@ void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
     wxButton *btnOldDefault = NULL;
-    wxPanel *panel = wxDynamicCast(parent, wxPanel);
-    if ( panel )
+    if ( parent )
     {
-        btnOldDefault = panel->GetDefaultItem();
-        panel->SetDefaultItem(this);
+        btnOldDefault = wxDynamicCast(parent->GetDefaultItem(),
+           wxButton);
+        parent->SetDefaultItem(this);
     }
 
-#ifdef __DARWIN__
 	Boolean inData;
 	if ( btnOldDefault && btnOldDefault->m_macControl )
 	{
   		inData = 0;
-		UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
+		::SetControlData( (ControlHandle) btnOldDefault->m_macControl , kControlButtonPart ,
 						   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
 	}
-	if ( m_macControl )
+	if ( (ControlHandle) m_macControl )
 	{
   		inData = 1;
-		UMASetControlData( m_macControl , kControlButtonPart ,
+		::SetControlData(  (ControlHandle) 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
 {
   wxSize sz = GetDefaultSize() ;
   
-    int wBtn = m_label.Length() * 8 + 12 ;
-	int hBtn = 20 ;
+  int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
 	
   if (wBtn > sz.x) sz.x = wBtn;
-  if (hBtn > sz.y) sz.y = hBtn;
   
   return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {
-    int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; 
-	int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
+    int wBtn = 70 ; 
+	int hBtn = 20 ;
+
+    if ( UMAHasAquaLayout() )
+    {
+        wBtn += 2 * kMacOSXHorizontalBorder ;
+        hBtn += 2 * kMacOSXVerticalBorder ;
+    }
 
     return wxSize(wBtn, hBtn);
 }
 
 void wxButton::Command (wxCommandEvent & event)
 {
-	if ( m_macControl )
-	{
-		HiliteControl( m_macControl , kControlButtonPart ) ;
-		unsigned long finalTicks ;
-		Delay( 8 , &finalTicks ) ;
-		HiliteControl( m_macControl , 0 ) ;
-	}
+    if ( (ControlHandle) m_macControl )
+    {
+        HiliteControl(  (ControlHandle) m_macControl , kControlButtonPart ) ;
+        unsigned long finalTicks ;
+        Delay( 8 , &finalTicks ) ;
+        HiliteControl(  (ControlHandle) m_macControl , 0 ) ;
+    }
     ProcessCommand (event);
 }
 
-void wxButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart ) 
 {
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
-    event.SetEventObject(this);
-    ProcessCommand(event);
+    if ( controlpart != kControlNoPart )
+    {
+        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
+        event.SetEventObject(this);
+        ProcessCommand(event);
+    }
 }