X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..bebc39e35d8ff465d2a4b41154daa325c5e76f10:/src/mac/radiobut.cpp

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index 65baab38b6..0d060bdb95 100644
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -2,7 +2,7 @@
 // Name:        radiobut.cpp
 // Purpose:     wxRadioButton
 // Author:      AUTHOR
-// Modified by:
+// Modified by: JS Lair (99/11/15) adding the cyclic groupe notion for radiobox
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
@@ -13,12 +13,16 @@
 #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"
+
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 		   const wxString& label,
            const wxPoint& pos,
@@ -26,43 +30,119 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
-    SetName(name);
-    SetValidator(validator);
-
-    if (parent) parent->AddChild(this);
+	Rect bounds ;
+	Str255 title ;
+	
+	MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-    if ( id == -1 )
-  	    m_windowId = (int)NewControlId();
-    else
-	    m_windowId = id;
-
-    m_windowStyle = style ;
-
-    // TODO create radiobutton
-    return FALSE;
-}
+	m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+	  	kControlRadioButtonProc , (long) this ) ;
+	
+	MacPostControlCreate() ;
 
-void wxRadioButton::SetLabel(const wxString& label)
-{
-    // TODO
+  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 value)
+void wxRadioButton::SetValue(bool val)
 {
-    // TODO
+	int i;
+	wxRadioButton *cycle;
+	  if ( GetControlValue( (ControlHandle) m_macControl ) == val )
+	    return ;
+	    
+   ::SetControlValue( (ControlHandle) m_macControl , val ) ;
+   if (val) 
+   {
+   		cycle=this->NextInCycle();
+  		if (cycle!=NULL) {
+   			while (cycle!=this) {
+   				cycle->SetValue(false);
+   				cycle=cycle->NextInCycle();
+   				}
+   			}
+   		}
+   MacRedrawControl() ;
 }
 
-// Get single selection, for single choice list items
 bool wxRadioButton::GetValue() const
 {
-    // TODO
-    return FALSE;
+    return ::GetControlValue( (ControlHandle) m_macControl ) ;
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
-  SetValue ( (event.m_commandInt != 0) );
+  SetValue ( (event.GetInt() != 0) );
   ProcessCommand (event);
 }
 
+void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+{
+    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);
+  	}
+}