added generic color dialog to setup

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

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 9a93378c0cbb1ccdcb2d40d4b8868c76838556bc..8fd9b91adf5e82680212c86d5fdcde816269e585 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "radiobut.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/radiobut.h"
 
 #if !USE_SHARED_LIBRARY
@@ -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 = UMANewControl( parent->GetMacRootWindow() , &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;
-       
+         if ( GetControlValue( m_macControl ) == val )
+           return ;
+           
    ::SetControlValue( m_macControl , val ) ;
-   
    if (val) 
    {
                cycle=this->NextInCycle();
@@ -75,10 +99,33 @@ 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);
+    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 +138,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);