X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..9082f1a970e72765544a23b6f0b3481011ddca15:/src/mac/radiobut.cpp?ds=sidebyside

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index f5f95dfab2..84f2a739cb 100644
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -15,6 +15,7 @@
 
 #include "wx/radiobut.h"
 
+
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
 #include <wx/mac/uma.h>
@@ -29,8 +30,6 @@ 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, 
@@ -38,7 +37,30 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 	
 	MacPostControlCreate() ;
 
-  return TRUE;
+  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)
+    {
+      wxWindow *child = node->GetData();
+      if (child->IsKindOf( CLASSINFO( wxRadioButton ) ) )
+      {
+          chief = (wxRadioButton*) child;
+         if (child->HasFlag(wxRB_GROUP)) break;
+      }
+      node = node->GetPrevious();
+    }
+    AddInCycle( chief ) ;
+  }
+    return TRUE;
 }
 
 void wxRadioButton::SetValue(bool val)
@@ -48,7 +70,8 @@ void wxRadioButton::SetValue(bool val)
 	
    ::SetControlValue( m_macControl , val ) ;
    
-   if (val) {
+   if (val) 
+   {
    		cycle=this->NextInCycle();
   		if (cycle!=NULL) {
    			while (cycle!=this) {
@@ -75,6 +98,7 @@ void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 contro
 	SetValue(true) ;
     wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
     event.SetEventObject(this);
+    event.SetInt( GetValue() );
     ProcessCommand(event);
 }
 
@@ -88,10 +112,10 @@ 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);
   	}
 }  
-