X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..2c724d25359c0d0d8d8c6592c7493c8c4dad54c8:/src/mac/carbon/radiobut.cpp

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 9a93378c0c..0d060bdb95 100644
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -13,13 +13,15 @@
 #pragma implementation "radiobut.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/radiobut.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 		   const wxString& label,
@@ -31,25 +33,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 = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
 	  	kControlRadioButtonProc , (long) this ) ;
 	
 	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)
 {
 	int i;
 	wxRadioButton *cycle;
-	
-   ::SetControlValue( m_macControl , val ) ;
-   
+	  if ( GetControlValue( (ControlHandle) m_macControl ) == val )
+	    return ;
+	    
+   ::SetControlValue( (ControlHandle) m_macControl , val ) ;
    if (val) 
    {
    		cycle=this->NextInCycle();
@@ -60,11 +84,12 @@ void wxRadioButton::SetValue(bool val)
    				}
    			}
    		}
+   MacRedrawControl() ;
 }
 
 bool wxRadioButton::GetValue() const
 {
-    return ::GetControlValue( m_macControl ) ;
+    return ::GetControlValue( (ControlHandle) m_macControl ) ;
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
@@ -73,12 +98,35 @@ 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)
@@ -91,7 +139,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);