X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7205570233ce8420b71fa5df368054c8953ff0e4..366e8ae67583e44f719d1c2fabb3a24eb3bda5b3:/src/mac/carbon/radiobut.cpp diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp index 476cf9ef10..e94c762f1d 100644 --- a/src/mac/carbon/radiobut.cpp +++ b/src/mac/carbon/radiobut.cpp @@ -35,7 +35,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, 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, kControlRadioButtonProc , (long) this ) ; MacPostControlCreate() ; @@ -68,12 +68,11 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, void wxRadioButton::SetValue(bool val) { - int i; wxRadioButton *cycle; - if ( GetControlValue( m_macControl ) == val ) + if ( GetControl32BitValue( (ControlHandle) m_macControl ) == val ) return ; - ::SetControlValue( m_macControl , val ) ; + ::SetControl32BitValue( (ControlHandle) m_macControl , val ) ; if (val) { cycle=this->NextInCycle(); @@ -84,11 +83,12 @@ void wxRadioButton::SetValue(bool val) } } } + MacRedrawControl() ; } bool wxRadioButton::GetValue() const { - return ::GetControlValue( m_macControl ) ; + return ::GetControl32BitValue( (ControlHandle) m_macControl ) ; } void wxRadioButton::Command (wxCommandEvent & event) @@ -97,7 +97,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 ;