X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..6ba636000f13b4bf7d3e7dcfad429713085f6700:/src/mac/button.cpp

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index cb44786443..47f66425e2 100644
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -31,8 +31,6 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 {
 	Rect bounds ;
 	Str255 title ;
-	m_macHorizontalBorder = 2 ; // additional pixels around the real control
-	m_macVerticalBorder = 2 ;
 	
 	MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
@@ -47,18 +45,53 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 void wxButton::SetDefault()
 {
-  wxWindow *parent = (wxWindow *)GetParent();
-  if (parent)
-      parent->SetDefaultItem(this);
-
+    wxWindow *parent = GetParent();
+    wxButton *btnOldDefault = NULL;
+    wxPanel *panel = wxDynamicCast(parent, wxPanel);
+    if ( panel )
+    {
+        btnOldDefault = panel->GetDefaultItem();
+        panel->SetDefaultItem(this);
+    }
+  
+  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) ) ;
-	}
+  }
+}
+
+wxSize wxButton::DoGetBestSize() const
+{
+    int wBtn = m_label.Length() * 8 + 12 ;
+	int hBtn = 20 ;
+	
+	if ( wBtn < 80 )
+		wBtn = 80 ;
+
+    return wxSize(wBtn, hBtn);
+}
+
+wxSize wxButton::GetDefaultSize()
+{
+    int wBtn = 80 /* + 2 * m_macHorizontalBorder */ ; 
+	int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
+
+    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 ) ;
+	}
     ProcessCommand (event);
 }