X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7205570233ce8420b71fa5df368054c8953ff0e4..bd996abe63a8ed6aa07b26856a0d7935002e3e81:/src/mac/checkbox.cpp diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp index d83a2fed05..94c9c92b2f 100644 --- a/src/mac/checkbox.cpp +++ b/src/mac/checkbox.cpp @@ -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 = ::NewControl( 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 WXUNUSED(control), wxInt16 WXUNUSED(controlpart) ) { SetValue( !GetValue() ) ; wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId ); @@ -70,11 +71,12 @@ void wxCheckBox::MacHandleControlClick( ControlHandle control , SInt16 controlpa } // Bitmap checkbox -bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, + const wxBitmap *label, + const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& validator, + const wxString& name) { SetName(name); SetValidator(validator); @@ -95,6 +97,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap) { // TODO + wxFAIL_MSG(wxT("wxBitmapCheckBox::SetLabel() not yet implemented")); } void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags) @@ -105,11 +108,13 @@ void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlag void wxBitmapCheckBox::SetValue(bool val) { // TODO + wxFAIL_MSG(wxT("wxBitmapCheckBox::SetValue() not yet implemented")); } bool wxBitmapCheckBox::GetValue() const { - // TODOD + // TODO + wxFAIL_MSG(wxT("wxBitmapCheckBox::GetValue() not yet implemented")); return FALSE; }