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 9a93378c0cbb1ccdcb2d40d4b8868c76838556bc..94aad1efaf75c1494d065b1b5230b3cb9c23e108 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -15,9 +15,8 @@
 
 #include "wx/radiobut.h"
 
 
 #include "wx/radiobut.h"
 

-#if !USE_SHARED_LIBRARY
+

 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)

-#endif

 
 #include <wx/mac/uma.h>
 
 
 #include <wx/mac/uma.h>
 


@@ -31,8 +30,6 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        Rect bounds ;
        Str255 title ;
        
        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, 
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
        m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 


@@ -40,7 +37,28 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        
        MacPostControlCreate() ;
 
        
        MacPostControlCreate() ;
 

-  return TRUE;
+  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)
 }
 
 void wxRadioButton::SetValue(bool val)


@@ -78,6 +96,7 @@ void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 contro
        SetValue(true) ;
     wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
     event.SetEventObject(this);
        SetValue(true) ;
     wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
     event.SetEventObject(this);

+    event.SetInt( GetValue() );

     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 


@@ -91,7 +110,8 @@ wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
                }
        else {
                current=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);
                m_cycle=cycle;
                current->m_cycle=this;
                return(cycle);