wxRadioBox fixed on mac

[wxWidgets.git] / src / mac / carbon / radiobut.cpp

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 65baab38b6731c39dd876d22546002a693ce1e41..94aad1efaf75c1494d065b1b5230b3cb9c23e108 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/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
@@ -15,9 +15,10 @@
 
 #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,
@@ -26,43 +27,93 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
-    SetName(name);
-    SetValidator(validator);
+       Rect bounds ;
+       Str255 title ;
+       
+       MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-    if (parent) parent->AddChild(this);
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+               kControlRadioButtonProc , (long) this ) ;
+       
+       MacPostControlCreate() ;
 
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
-
-    m_windowStyle = style ;
-
-    // TODO create radiobutton
-    return FALSE;
+  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::SetLabel(const wxString& label)
+void wxRadioButton::SetValue(bool val)
 {
-    // TODO
+       int i;
+       wxRadioButton *cycle;
+       
+   ::SetControlValue( m_macControl , val ) ;
+   
+   if (val) 
+   {
+               cycle=this->NextInCycle();
+               if (cycle!=NULL) {
+                       while (cycle!=this) {
+                               cycle->SetValue(false);
+                               cycle=cycle->NextInCycle();
+                               }
+                       }
+               }
 }
 
-void wxRadioButton::SetValue(bool value)
-{
-    // TODO
-}
-
-// Get single selection, for single choice list items
 bool wxRadioButton::GetValue() const
 {
-    // TODO
-    return FALSE;
+    return ::GetControlValue( m_macControl ) ;
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
-  SetValue ( (event.m_commandInt != 0) );
+  SetValue ( (event.GetInt() != 0) );
   ProcessCommand (event);
 }
 
+void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+       SetValue(true) ;
+    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+    event.SetEventObject(this);
+    event.SetInt( GetValue() );
+    ProcessCommand(event);
+}
 
+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);
+       }
+}