X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37e2cb08cd1910ec5a14b38f0addfc6e2e8e172e..7946d7deaac081a745dc616a5eb13ae864865fa2:/src/mac/carbon/button.cpp

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 4635492a17..e8a9b079b6 100644
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -13,9 +13,14 @@
 #pragma implementation "button.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/button.h"
+#include "wx/panel.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
+#endif
 
 #include <wx/mac/uma.h>
 // Button
@@ -29,12 +34,10 @@ 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 ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
 	  	kControlPushButtonProc , (long) this ) ;
 	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
 	
@@ -50,38 +53,69 @@ void wxButton::SetDefault()
     wxPanel *panel = wxDynamicCast(parent, wxPanel);
     if ( panel )
     {
-        btnOldDefault = panel->GetDefaultItem();
+        btnOldDefault = wxDynamicCast(panel->GetDefaultItem(),
+           wxButton);
         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) ) ;
-  }
+
+#ifdef __DARWIN__
+	Boolean inData;
+	if ( btnOldDefault && btnOldDefault->m_macControl )
+	{
+  		inData = 0;
+		UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
+						   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+	}
+	if ( m_macControl )
+	{
+  		inData = 1;
+		UMASetControlData( 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
 {
-    int wBtn = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
-	int hBtn = 13 + 2 * m_macVerticalBorder;
-
-    return wxSize(wBtn, hBtn);
+  wxSize sz = GetDefaultSize() ;
+  
+    int wBtn = m_label.Length() * 8 + 12 ;
+	int hBtn = 20 ;
+	
+  if (wBtn > sz.x) sz.x = wBtn;
+  if (hBtn > sz.y) sz.y = hBtn;
+  
+  return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {
-    int wBtn = 15 * 8 + 12 + 2 * 2;
-	int hBtn = 13 + 2 * 2;
+    int wBtn = 70 /* + 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);
 }