X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..90f3fe56ee58fec86d7f938f9c630c0745f0a2dc:/src/mac/radiobut.cpp?ds=sidebyside diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp index a2fc26d840..0d060bdb95 100644 --- a/src/mac/radiobut.cpp +++ b/src/mac/radiobut.cpp @@ -13,11 +13,15 @@ #pragma implementation "radiobut.h" #endif +#include "wx/defs.h" + #include "wx/radiobut.h" +#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) +#endif -#include <wx/mac/uma.h> +#include "wx/mac/uma.h" bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, @@ -29,26 +33,49 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, Rect bounds ; Str255 title ; - m_cycle=NULL; - MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, kControlRadioButtonProc , (long) this ) ; MacPostControlCreate() ; - return TRUE; + m_cycle = this ; + + if (HasFlag(wxRB_GROUP)) + { + AddInCycle( NULL ) ; + } + else + { + /* search backward for last group start */ + wxRadioButton *chief = (wxRadioButton*) NULL; + wxWindowList::Node *node = parent->GetChildren().GetLast(); + while (node) + { + wxWindow *child = node->GetData(); + if (child->IsKindOf( CLASSINFO( wxRadioButton ) ) ) + { + chief = (wxRadioButton*) child; + if (child->HasFlag(wxRB_GROUP)) break; + } + node = node->GetPrevious(); + } + AddInCycle( chief ) ; + } + return TRUE; } void wxRadioButton::SetValue(bool val) { int i; wxRadioButton *cycle; - - ::SetControlValue( m_macControl , val ) ; - - if (val) { + if ( GetControlValue( (ControlHandle) m_macControl ) == val ) + return ; + + ::SetControlValue( (ControlHandle) m_macControl , val ) ; + if (val) + { cycle=this->NextInCycle(); if (cycle!=NULL) { while (cycle!=this) { @@ -57,11 +84,12 @@ void wxRadioButton::SetValue(bool val) } } } + MacRedrawControl() ; } bool wxRadioButton::GetValue() const { - return ::GetControlValue( m_macControl ) ; + return ::GetControlValue( (ControlHandle) m_macControl ) ; } void wxRadioButton::Command (wxCommandEvent & event) @@ -70,9 +98,35 @@ void wxRadioButton::Command (wxCommandEvent & event) ProcessCommand (event); } -void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) { - SetValue(true) ; + 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) @@ -85,10 +139,10 @@ wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle) } else { current=cycle; - while ((next=current->m_cycle)!=cycle) current=current->m_cycle; + while ((next=current->m_cycle)!=cycle) + current=current->m_cycle; m_cycle=cycle; current->m_cycle=this; return(cycle); } } -