X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8c736e563cbf50bc5825c1a52878403ee48f513..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/mac/radiobut.cpp diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp index 8fd9b91adf..0d060bdb95 100644 --- a/src/mac/radiobut.cpp +++ b/src/mac/radiobut.cpp @@ -21,7 +21,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) #endif -#include +#include "wx/mac/uma.h" bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, @@ -35,7 +35,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, 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, kControlRadioButtonProc , (long) this ) ; MacPostControlCreate() ; @@ -70,10 +70,10 @@ void wxRadioButton::SetValue(bool val) { int i; wxRadioButton *cycle; - if ( GetControlValue( m_macControl ) == val ) + if ( GetControlValue( (ControlHandle) m_macControl ) == val ) return ; - ::SetControlValue( m_macControl , val ) ; + ::SetControlValue( (ControlHandle) m_macControl , val ) ; if (val) { cycle=this->NextInCycle(); @@ -84,11 +84,12 @@ void wxRadioButton::SetValue(bool val) } } } + MacRedrawControl() ; } bool wxRadioButton::GetValue() const { - return ::GetControlValue( m_macControl ) ; + return ::GetControlValue( (ControlHandle) m_macControl ) ; } void wxRadioButton::Command (wxCommandEvent & event) @@ -97,7 +98,7 @@ void wxRadioButton::Command (wxCommandEvent & event) ProcessCommand (event); } -void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) { if ( GetValue() ) return ;