#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
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( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1,
kControlPushButtonProc , (long) this ) ;
wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
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) ) ;
- }
+
+ Boolean inData;
+ if ( btnOldDefault && btnOldDefault->m_macControl )
+ {
+ inData = 0;
+ ::SetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
+ kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+ }
+ if ( m_macControl )
+ {
+ inData = 1;
+ ::SetControlData( 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);
void wxButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
{
+ if ( controlpart != kControlNoPart )
+ {
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
event.SetEventObject(this);
ProcessCommand(event);
+ }
}