X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..b1633d20d6f06a0b5a77d5208c0beddf19324f33:/src/mac/button.cpp diff --git a/src/mac/button.cpp b/src/mac/button.cpp index befd0d7156..cbc1d846d9 100644 --- a/src/mac/button.cpp +++ b/src/mac/button.cpp @@ -13,63 +13,105 @@ #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 + bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { - SetName(name); - SetValidator(validator); - m_windowStyle = style; - - parent->AddChild((wxButton *)this); - - if (id == -1) - m_windowId = NewControlId(); - else - m_windowId = id; - - // TODO: create button - - return FALSE; -} - -void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags) -{ - // TODO + Rect bounds ; + Str255 title ; + + MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; + + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, + kControlPushButtonProc , (long) this ) ; + wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ; + + MacPostControlCreate() ; + + return TRUE; } void wxButton::SetDefault() { - wxWindow *parent = (wxWindow *)GetParent(); - if (parent) + wxWindow *parent = GetParent(); + wxButton *btnOldDefault = NULL; + if ( parent ) + { + btnOldDefault = wxDynamicCast(parent->GetDefaultItem(), + wxButton); parent->SetDefaultItem(this); - - // TODO: make button the default + } + + 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) ) ; + } } -wxString wxButton::GetLabel() const +wxSize wxButton::DoGetBestSize() const { - // TODO - return wxString(""); + 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 ; } -void wxButton::SetLabel(const wxString& label) +wxSize wxButton::GetDefaultSize() { - // TODO + int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; + int hBtn = 20 /* + 2 * m_macVerticalBorder */ ; + + return wxSize(wBtn, hBtn); } void wxButton::Command (wxCommandEvent & event) { + 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( WXWidget control , wxInt16 controlpart ) +{ + if ( controlpart != kControlNoPart ) + { + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId ); + event.SetEventObject(this); + ProcessCommand(event); + } +} +