X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0822896b3354f8698835d234ce2655daa640704..5fc01d1326a34223746546326a7f616df8bfa991:/src/mac/carbon/radiobut.cpp?ds=sidebyside diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp index c786409a4d..c7101f60ad 100644 --- a/src/mac/carbon/radiobut.cpp +++ b/src/mac/carbon/radiobut.cpp @@ -6,42 +6,49 @@ // 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 ) ; + m_macIsUserPane = FALSE ; + + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) + return false; + + m_label = label ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, - kControlRadioButtonProc , (long) this ) ; - - MacPostControlCreate() ; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + + m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, + kControlRadioButtonProc , (long) this ) ; + + MacPostControlCreate(pos,size) ; m_cycle = this ; if (HasFlag(wxRB_GROUP)) { - AddInCycle( NULL ) ; + AddInCycle( NULL ) ; } else { @@ -65,27 +72,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 ( GetControl32BitValue( (ControlRef) m_macControl ) == val ) + return ; + + ::SetControl32BitValue( (ControlRef) 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( (ControlRef) m_macControl ) ; } void wxRadioButton::Command (wxCommandEvent & event) @@ -94,24 +101,24 @@ void wxRadioButton::Command (wxCommandEvent & event) ProcessCommand (event); } -void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) { if ( GetValue() ) return ; - 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,18 +134,18 @@ void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 contro 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); + } }