X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdaf613add176525ed8b6cafaf278dfd80f85074..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/mac/radiobut.cpp diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp index 8ce7963ab1..991c8be68f 100644 --- a/src/mac/radiobut.cpp +++ b/src/mac/radiobut.cpp @@ -6,42 +6,48 @@ // Created: ??/??/98 // RCS-ID: $Id$ // Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #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 +#include "wx/mac/uma.h" bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { - Rect bounds ; - Str255 title ; - - MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) + return false; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, - kControlRadioButtonProc , (long) this ) ; - - MacPostControlCreate() ; + Rect bounds ; + Str255 title ; + + MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; + + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, + kControlRadioButtonProc , (long) this ) ; + + MacPostControlCreate() ; m_cycle = this ; if (HasFlag(wxRB_GROUP)) { - AddInCycle( NULL ) ; + AddInCycle( NULL ) ; } else { @@ -65,28 +71,27 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, void wxRadioButton::SetValue(bool val) { - int i; - wxRadioButton *cycle; - if ( GetControlValue( m_macControl ) == val ) - return ; - - ::SetControlValue( m_macControl , val ) ; - Refresh() ; + wxRadioButton *cycle; + if ( GetControl32BitValue( (ControlHandle) m_macControl ) == val ) + return ; + + ::SetControl32BitValue( (ControlHandle) m_macControl , val ) ; if (val) { - cycle=this->NextInCycle(); - if (cycle!=NULL) { - while (cycle!=this) { - cycle->SetValue(false); - cycle=cycle->NextInCycle(); - } - } - } + cycle=this->NextInCycle(); + if (cycle!=NULL) { + while (cycle!=this) { + cycle->SetValue(false); + cycle=cycle->NextInCycle(); + } + } + } + MacRedrawControl() ; } bool wxRadioButton::GetValue() const { - return ::GetControlValue( m_macControl ) ; + return ::GetControl32BitValue( (ControlHandle) m_macControl ) ; } void wxRadioButton::Command (wxCommandEvent & event) @@ -95,29 +100,51 @@ void wxRadioButton::Command (wxCommandEvent & event) ProcessCommand (event); } -void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) { - 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) { - wxRadioButton *next,*current; - - if (cycle==NULL) { - m_cycle=this; - return(this); - } - else { - current=cycle; - while ((next=current->m_cycle)!=cycle) - current=current->m_cycle; - m_cycle=cycle; - current->m_cycle=this; - return(cycle); - } + wxRadioButton *next,*current; + + if (cycle==NULL) { + m_cycle=this; + return(this); + } + else { + current=cycle; + while ((next=current->m_cycle)!=cycle) + current=current->m_cycle; + m_cycle=cycle; + current->m_cycle=this; + return(cycle); + } }