X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..7b1279006496ba3251a755bcef91301ad107bb78:/src/mac/carbon/button.cpp

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 47f66425e2..cbc1d846d9 100644
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -13,13 +13,16 @@
 #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>
+#include "wx/mac/uma.h"
 // Button
 
 
@@ -34,9 +37,9 @@ 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 , true , 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() ;
 
@@ -47,37 +50,44 @@ 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);
     }
-  
-  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) ) ;
-  }
+
+	Boolean inData;
+	if ( btnOldDefault && btnOldDefault->m_macControl )
+	{
+  		inData = 0;
+		::SetControlData( (ControlHandle) btnOldDefault->m_macControl , kControlButtonPart ,
+						   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+	}
+	if ( (ControlHandle) m_macControl )
+	{
+  		inData = 1;
+		::SetControlData(  (ControlHandle) m_macControl , kControlButtonPart ,
+						   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+	}
 }
 
 wxSize wxButton::DoGetBestSize() const
 {
+  wxSize sz = GetDefaultSize() ;
+  
     int wBtn = m_label.Length() * 8 + 12 ;
 	int hBtn = 20 ;
 	
-	if ( wBtn < 80 )
-		wBtn = 80 ;
-
-    return wxSize(wBtn, hBtn);
+  if (wBtn > sz.x) sz.x = wBtn;
+  if (hBtn > sz.y) sz.y = hBtn;
+  
+  return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {
-    int wBtn = 80 /* + 2 * m_macHorizontalBorder */ ; 
+    int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; 
 	int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
 
     return wxSize(wBtn, hBtn);
@@ -85,20 +95,23 @@ wxSize wxButton::GetDefaultSize()
 
 void wxButton::Command (wxCommandEvent & event)
 {
-	if ( m_macControl )
+	if ( (ControlHandle) m_macControl )
 	{
-		HiliteControl( m_macControl , kControlButtonPart ) ;
+		HiliteControl(  (ControlHandle) m_macControl , kControlButtonPart ) ;
 		unsigned long finalTicks ;
 		Delay( 8 , &finalTicks ) ;
-		HiliteControl( m_macControl , 0 ) ;
+		HiliteControl(  (ControlHandle) m_macControl , 0 ) ;
 	}
     ProcessCommand (event);
 }
 
-void wxButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
+  if ( controlpart != kControlNoPart )
+  {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
     event.SetEventObject(this);
     ProcessCommand(event);
+  }
 }