X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8c736e563cbf50bc5825c1a52878403ee48f513..58ec225526177917a3806c6cd394ab56d18280e1:/src/mac/checkbox.cpp?ds=sidebyside diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp index 0d5d9e1e46..85ebcf2391 100644 --- a/src/mac/checkbox.cpp +++ b/src/mac/checkbox.cpp @@ -22,7 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) #endif -#include +#include "wx/mac/uma.h" // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, @@ -36,7 +36,7 @@ bool wxCheckBox::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 , false , 0 , 0 , 1, + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, kControlCheckBoxProc , (long) this ) ; MacPostControlCreate() ; @@ -46,12 +46,13 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, void wxCheckBox::SetValue(bool val) { - ::SetControlValue( m_macControl , val ) ; + ::SetControlValue( (ControlHandle) m_macControl , val ) ; + MacRedrawControl() ; } bool wxCheckBox::GetValue() const { - return ::GetControlValue( m_macControl ) ; + return ::GetControlValue( (ControlHandle) m_macControl ) ; } void wxCheckBox::Command (wxCommandEvent & event) @@ -60,7 +61,7 @@ void wxCheckBox::Command (wxCommandEvent & event) ProcessCommand (event); } -void wxCheckBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +void wxCheckBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) { SetValue( !GetValue() ) ; wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );