X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa6c945b0ac03ac048f1323292d7d2c11006b759..49a91764b57168d9f441578001b3206a7330ee70:/src/mac/carbon/radiobut.cpp diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp index 84f2a739cb..8fd9b91adf 100644 --- a/src/mac/carbon/radiobut.cpp +++ b/src/mac/carbon/radiobut.cpp @@ -13,10 +13,13 @@ #pragma implementation "radiobut.h" #endif -#include "wx/radiobut.h" +#include "wx/defs.h" +#include "wx/radiobut.h" +#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) +#endif #include @@ -32,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 , true , 0 , 0 , 1, + m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, kControlRadioButtonProc , (long) this ) ; MacPostControlCreate() ; @@ -67,9 +70,10 @@ void wxRadioButton::SetValue(bool val) { int i; wxRadioButton *cycle; - + if ( GetControlValue( m_macControl ) == val ) + return ; + ::SetControlValue( m_macControl , val ) ; - if (val) { cycle=this->NextInCycle(); @@ -95,11 +99,33 @@ void wxRadioButton::Command (wxCommandEvent & event) void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) { - SetValue(true) ; - wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId ); - event.SetEventObject(this); - event.SetInt( GetValue() ); - ProcessCommand(event); + if ( GetValue() ) + return ; + + wxRadioButton *cycle, *old = NULL ; + cycle=this->NextInCycle(); + if (cycle!=NULL) { + while (cycle!=this) { + if ( cycle->GetValue() ) { + old = cycle ; + cycle->SetValue(false); + } + cycle=cycle->NextInCycle(); + } + } + + SetValue(true) ; + + if ( old ) { + wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, old->m_windowId ); + event.SetEventObject(old); + event.SetInt( false ); + old->ProcessCommand(event); + } + wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId ); + event2.SetEventObject(this); + event2.SetInt( true ); + ProcessCommand(event2); } wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)