X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..bcd882b35e56a43f894551a43bbc4937034b7a0b:/src/mac/carbon/radiobut.cpp?ds=sidebyside diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp index 32ad08047e..a370f1aa6d 100644 --- a/src/mac/carbon/radiobut.cpp +++ b/src/mac/carbon/radiobut.cpp @@ -9,11 +9,13 @@ // 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" + +#if wxUSE_RADIOBTN #include "wx/radiobut.h" @@ -39,8 +41,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + m_peer = new wxMacControl(this) ; verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , - 0 , false /* no autotoggle */ , (ControlRef*) &m_macControl ) ) ; + 0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) ); + MacPostControlCreate(pos,size) ; @@ -54,7 +58,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, { /* search backward for last group start */ wxRadioButton *chief = (wxRadioButton*) NULL; - wxWindowList::Node *node = parent->GetChildren().GetLast(); + wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast(); while (node) { wxWindow *child = node->GetData(); @@ -73,26 +77,27 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, void wxRadioButton::SetValue(bool val) { wxRadioButton *cycle; - if ( GetControl32BitValue( (ControlRef) m_macControl ) == val ) + if ( m_peer->GetValue() == val ) return ; - ::SetControl32BitValue( (ControlRef) m_macControl , 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( (ControlRef) m_macControl ) ; + return m_peer->GetValue() ; } void wxRadioButton::Command (wxCommandEvent & event) @@ -151,3 +156,5 @@ wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle) return(cycle); } } + +#endif