X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/493c9f6bb22eef04391998cb1770cf32f1cc6efc..49a91764b57168d9f441578001b3206a7330ee70:/src/mac/radiobut.cpp?ds=inline diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp index 99d51f705c..8fd9b91adf 100644 --- a/src/mac/radiobut.cpp +++ b/src/mac/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 @@ -81,10 +84,6 @@ void wxRadioButton::SetValue(bool val) } } } - wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId ); - event.SetEventObject(this); - event.SetInt( GetValue() ); - ProcessCommand(event); } bool wxRadioButton::GetValue() const @@ -100,7 +99,33 @@ void wxRadioButton::Command (wxCommandEvent & event) void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) { + 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)