X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/079c842cae5a3ad08ad930ebc29a33c59acf634d..dd107c50be43e8d4dbdba20df162faf119a3781c:/src/mac/radiobut.cpp

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index 1f5bb9c67a..99d51f705c 100644
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -18,10 +18,6 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
-BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
-   EVT_IDLE( wxRadioButton::OnIdle )
-END_EVENT_TABLE()
-
 #include <wx/mac/uma.h>
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
@@ -34,71 +30,47 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 	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, 
+	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
 	  	kControlRadioButtonProc , (long) this ) ;
 	
 	MacPostControlCreate() ;
 
-    return TRUE;
-}
-
-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;
-	
+	  if ( GetControlValue( m_macControl ) == val )
+	    return ;
+	    
    ::SetControlValue( m_macControl , val ) ;
-   
    if (val) 
    {
    		cycle=this->NextInCycle();
@@ -109,6 +81,10 @@ void wxRadioButton::SetValue(bool val)
    				}
    			}
    		}
+    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+    event.SetEventObject(this);
+    event.SetInt( GetValue() );
+    ProcessCommand(event);
 }
 
 bool wxRadioButton::GetValue() const
@@ -124,10 +100,7 @@ void wxRadioButton::Command (wxCommandEvent & event)
 
 void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
-	SetValue(true) ;
-    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
-    event.SetEventObject(this);
-    ProcessCommand(event);
+	  SetValue(true) ;
 }
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
@@ -140,7 +113,8 @@ wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
 		}
 	else {
 		current=cycle;
-  		while ((next=current->m_cycle)!=cycle) current=current->m_cycle;
+  		while ((next=current->m_cycle)!=cycle) 
+  		  current=current->m_cycle;
 	  	m_cycle=cycle;
 	  	current->m_cycle=this;
 	  	return(cycle);