X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/affd2611c569d9d8e60fa542614f6668956b16de..05d8deda209e232835c7de64b821f569c9711df8:/src/mac/carbon/radiobut.cpp diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp index 52cc12108a..6819f25a91 100644 --- a/src/mac/carbon/radiobut.cpp +++ b/src/mac/carbon/radiobut.cpp @@ -9,11 +9,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobut.h" #endif -#include "wx/defs.h" +#include "wx/wxprec.h" #include "wx/radiobut.h" @@ -41,7 +41,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, m_peer = new wxMacControl() ; verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , - 0 , false /* no autotoggle */ , *m_peer ) ); + 0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) ); MacPostControlCreate(pos,size) ; @@ -75,26 +75,27 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, void wxRadioButton::SetValue(bool val) { wxRadioButton *cycle; - if ( GetControl32BitValue( *m_peer ) == val ) + if ( m_peer->GetValue() == val ) return ; - ::SetControl32BitValue( *m_peer , val ) ; - if (val) - { - cycle=this->NextInCycle(); - if (cycle!=NULL) { - while (cycle!=this) { - cycle->SetValue(false); - cycle=cycle->NextInCycle(); - } - } + m_peer->SetValue( val ) ; + if (val) + { + cycle=this->NextInCycle(); + if (cycle!=NULL) + { + while (cycle!=this) + { + cycle->SetValue(false); + cycle=cycle->NextInCycle(); } - MacRedrawControl() ; + } + } } bool wxRadioButton::GetValue() const { - return ::GetControl32BitValue( *m_peer ) ; + return m_peer->GetValue() ; } void wxRadioButton::Command (wxCommandEvent & event)