X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73969f3fad01a014483f682173ec5ba9c92d6c10..db36543353d37c2357e8e30aab53ff37337b1127:/src/mac/carbon/radiobut.cpp?ds=sidebyside diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp index 6421f60596..1a31f44a25 100644 --- a/src/mac/carbon/radiobut.cpp +++ b/src/mac/carbon/radiobut.cpp @@ -6,7 +6,7 @@ // Created: ??/??/98 // RCS-ID: $Id$ // Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -24,33 +24,39 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) #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 ) ; + m_macIsUserPane = FALSE ; + + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) + return false; + + m_label = label ; - m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, - kControlRadioButtonProc , (long) this ) ; - - MacPostControlCreate() ; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + + m_peer = new wxMacControl() ; + verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , + 0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) ); + + + MacPostControlCreate(pos,size) ; m_cycle = this ; if (HasFlag(wxRB_GROUP)) { - AddInCycle( NULL ) ; + AddInCycle( NULL ) ; } else { /* 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(); @@ -68,28 +74,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 ) ; + wxRadioButton *cycle; + if ( m_peer->GetValue() == val ) + return ; + + m_peer->SetValue( 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 m_peer->GetValue() ; } void wxRadioButton::Command (wxCommandEvent & event) @@ -98,24 +103,25 @@ void wxRadioButton::Command (wxCommandEvent & event) ProcessCommand (event); } -void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +wxInt32 wxRadioButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { + // if already set -> no action if ( GetValue() ) - return ; + return noErr; - wxRadioButton *cycle, *old = NULL ; + wxRadioButton *cycle, *old = NULL ; cycle=this->NextInCycle(); if (cycle!=NULL) { - while (cycle!=this) { - if ( cycle->GetValue() ) { - old = cycle ; - cycle->SetValue(false); - } - cycle=cycle->NextInCycle(); - } + while (cycle!=this) { + if ( cycle->GetValue() ) { + old = cycle ; + cycle->SetValue(false); + } + cycle=cycle->NextInCycle(); + } } - SetValue(true) ; + SetValue(true) ; if ( old ) { wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, old->m_windowId ); @@ -127,22 +133,23 @@ void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 contro event2.SetEventObject(this); event2.SetInt( true ); ProcessCommand(event2); + return noErr ; } 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); + } }