X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..bbd92d1dbea02db8c28e9c17bfacc0563d855b25:/src/mac/carbon/radiobut.cpp diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp index 936b8a54e8..7f866d2536 100644 --- a/src/mac/carbon/radiobut.cpp +++ b/src/mac/carbon/radiobut.cpp @@ -2,7 +2,7 @@ // Name: radiobut.cpp // Purpose: wxRadioButton // Author: AUTHOR -// Modified by: JS Lair (99/11/15) adding the cyclic groupe notion for radiobox +// Modified by: JS Lair (99/11/15) adding the cyclic group notion for radiobox // Created: ??/??/98 // RCS-ID: $Id$ // Copyright: (c) AUTHOR @@ -14,57 +14,64 @@ #if wxUSE_RADIOBTN #include "wx/radiobut.h" +#include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -#include "wx/mac/uma.h" -bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool wxRadioButton::Create( wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name ) { - m_macIsUserPane = false ; + m_macIsUserPane = false; - if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) + if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) ) return false; - m_label = label ; - - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + m_labelOrig = m_label = label; - m_peer = new wxMacControl(this) ; - verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , - 0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) ); + Rect bounds = wxMacGetBoundsForControl( this, pos, size ); + m_peer = new wxMacControl( this ); + OSStatus err = CreateRadioButtonControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, CFSTR(""), + 0, false /* no autotoggle */, m_peer->GetControlRefAddr() ); + verify_noerr( err ); - MacPostControlCreate(pos,size) ; + MacPostControlCreate( pos, size ); - m_cycle = this ; + m_cycle = this; - if (HasFlag(wxRB_GROUP)) + if (HasFlag( wxRB_GROUP )) { - AddInCycle( NULL ) ; + AddInCycle( NULL ); } else { - /* search backward for last group start */ - wxRadioButton *chief = (wxRadioButton*) NULL; + // search backward for last group start + wxRadioButton *chief = NULL; wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast(); while (node) { wxWindow *child = node->GetData(); - if (child->IsKindOf( CLASSINFO( wxRadioButton ) ) ) + if (child->IsKindOf( CLASSINFO( wxRadioButton ) )) { - chief = (wxRadioButton*) child; - if (child->HasFlag(wxRB_GROUP)) break; + chief = (wxRadioButton*)child; + if (child->HasFlag( wxRB_GROUP )) + break; } + node = node->GetPrevious(); } - AddInCycle( chief ) ; + + AddInCycle( chief ); } + return true; } @@ -76,19 +83,19 @@ wxRadioButton::~wxRadioButton() void wxRadioButton::SetValue(bool val) { wxRadioButton *cycle; - if ( m_peer->GetValue() == val ) - return ; + if (m_peer->GetValue() == val) + return; - m_peer->SetValue( val ) ; + m_peer->SetValue( val ); if (val) { - cycle=this->NextInCycle(); - if (cycle!=NULL) + cycle = this->NextInCycle(); + if (cycle != NULL) { - while (cycle!=this) + while (cycle != this) { - cycle->SetValue(false); - cycle=cycle->NextInCycle(); + cycle->SetValue( false ); + cycle = cycle->NextInCycle(); } } } @@ -96,75 +103,76 @@ void wxRadioButton::SetValue(bool val) bool wxRadioButton::GetValue() const { - return m_peer->GetValue() ; + return m_peer->GetValue(); } -void wxRadioButton::Command (wxCommandEvent & event) +void wxRadioButton::Command(wxCommandEvent& event) { - SetValue ( (event.GetInt() != 0) ); - ProcessCommand (event); + SetValue( (event.GetInt() != 0) ); + ProcessCommand( event ); } -wxInt32 wxRadioButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +wxInt32 wxRadioButton::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler), WXEVENTREF WXUNUSED(event) ) { // if already set -> no action - if ( GetValue() ) + if (GetValue()) return noErr; wxRadioButton *cycle; - cycle=this->NextInCycle(); - if (cycle!=NULL) { - while (cycle!=this) { - if ( cycle->GetValue() ) { - cycle->SetValue(false); - } - cycle=cycle->NextInCycle(); + cycle = this->NextInCycle(); + if (cycle != NULL) + { + while (cycle != this) + { + if (cycle->GetValue()) + cycle->SetValue( false ); + + cycle = cycle->NextInCycle(); } } - SetValue(true) ; + SetValue( true ); - wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId ); - event2.SetEventObject(this); + wxCommandEvent event2( wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId ); + event2.SetEventObject( this ); event2.SetInt( true ); - ProcessCommand(event2); - return noErr ; + ProcessCommand( event2 ); + + return noErr; } wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle) { - wxRadioButton *next,*current; + wxRadioButton *current; - if (cycle==NULL) + if (cycle == NULL) { - m_cycle=this; - return(this); + m_cycle = this; } else { - current=cycle; - while ((next=current->m_cycle)!=cycle) - current=current->m_cycle; - m_cycle=cycle; - current->m_cycle=this; - return(cycle); + current = cycle; + while (current->m_cycle != cycle) + current = current->m_cycle; + + m_cycle = cycle; + current->m_cycle = this; } + + return m_cycle; } void wxRadioButton::RemoveFromCycle() { - if (m_cycle==NULL || m_cycle == this) - { + if ((m_cycle == NULL) || (m_cycle == this)) return; - } - else - { - // Find the previous one and make it point to the next one - wxRadioButton* prev = this; - while (prev->m_cycle != this) - prev = prev->m_cycle; - prev->m_cycle = m_cycle; - } + + // Find the previous one and make it point to the next one + wxRadioButton* prev = this; + while (prev->m_cycle != this) + prev = prev->m_cycle; + + prev->m_cycle = m_cycle; } #endif