X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/079c842cae5a3ad08ad930ebc29a33c59acf634d..0b49ccf8d66e2568e2b0de85c25b406aad39f3b1:/src/mac/radiobut.cpp
diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index 1f5bb9c67a..46014e4576 100644
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -6,114 +6,89 @@
// 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
-BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
- EVT_IDLE( wxRadioButton::OnIdle )
-END_EVENT_TABLE()
-
-#include <wx/mac/uma.h>
+#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 ;
-
- 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,
- kControlRadioButtonProc , (long) this ) ;
-
- MacPostControlCreate() ;
+ Rect bounds ;
+ Str255 title ;
+
+ MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
- return TRUE;
-}
+ m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,
+ kControlRadioButtonProc , (long) this ) ;
+
+ MacPostControlCreate() ;
-void wxRadioButton::OnIdle( wxIdleEvent &event )
-{
- if (!m_cycle && HasFlag(wxRB_GROUP))
+ 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)
{
- // we are a stand-alone radiobutton and have
- // the group flag indicating we have to collect
- // the other radiobuttons belonging to this one
-
- bool reached_this = FALSE;
- wxRadioButton *m_radioButtonCycle = NULL;
- m_radioButtonCycle = AddInCycle( m_radioButtonCycle );
-
- wxWindow *parent = GetParent();
- wxNode *node = parent->GetChildren().First();
- while (node)
- {
- wxWindow *child = (wxWindow*) node->Data();
-
- node = node->Next();
-
- // start searching behind current radiobutton
- if (!reached_this)
- {
- reached_this = (this == child);
- continue;
- }
-
- if (child->IsKindOf( CLASSINFO ( wxRadioButton ) ))
- {
- wxRadioButton *rb = (wxRadioButton*) child;
-
- // already reached next group
- if (rb->HasFlag(wxRB_GROUP)) break;
-
- // part of a radiobox
- if (rb->NextInCycle()) break;
-
- m_radioButtonCycle = rb->AddInCycle( m_radioButtonCycle );
- }
- }
-
+ wxWindow *child = node->GetData();
+ if (child->IsKindOf( CLASSINFO( wxRadioButton ) ) )
+ {
+ chief = (wxRadioButton*) child;
+ if (child->HasFlag(wxRB_GROUP)) break;
+ }
+ node = node->GetPrevious();
}
-
- event.Skip( TRUE );
+ AddInCycle( chief ) ;
+ }
+ return TRUE;
}
void wxRadioButton::SetValue(bool val)
{
- int i;
- wxRadioButton *cycle;
-
- ::SetControlValue( m_macControl , val ) ;
-
+ 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)
@@ -122,27 +97,51 @@ void wxRadioButton::Command (wxCommandEvent & event)
ProcessCommand (event);
}
-void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
+void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
{
- SetValue(true) ;
- wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
- event.SetEventObject(this);
- 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);
+ }
}