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

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 65baab38b6..e7f983642d 100644
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -2,67 +2,152 @@
 // 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
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "radiobut.h"
 #endif
 
+#include "wx/wxprec.h"
+
+#if wxUSE_RADIOBTN
+
 #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 wxString& label,
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
-    SetName(name);
-    SetValidator(validator);
+    m_macIsUserPane = false ;
 
-    if (parent) parent->AddChild(this);
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return false;
 
-    if ( id == -1 )
-  	    m_windowId = (int)NewControlId();
-    else
-	    m_windowId = id;
+    m_label = label ;
 
-    m_windowStyle = style ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
-    // TODO create radiobutton
-    return FALSE;
-}
+    m_peer = new wxMacControl(this) ;
+    verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
+        0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) );
 
-void wxRadioButton::SetLabel(const wxString& label)
-{
-    // TODO
+
+    MacPostControlCreate(pos,size) ;
+
+    m_cycle = this ;
+
+    if (HasFlag(wxRB_GROUP))
+    {
+        AddInCycle( NULL ) ;
+    }
+    else
+    {
+        /* search backward for last group start */
+        wxRadioButton *chief = (wxRadioButton*) NULL;
+        wxWindowList::compatibility_iterator 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
+    wxRadioButton *cycle;
+    if ( m_peer->GetValue() == val )
+        return ;
+
+    m_peer->SetValue( val ) ;
+    if (val)
+    {
+        cycle=this->NextInCycle();
+        if (cycle!=NULL)
+        {
+            while (cycle!=this)
+            {
+                cycle->SetValue(false);
+                cycle=cycle->NextInCycle();
+            }
+        }
+    }
 }
 
-// Get single selection, for single choice list items
 bool wxRadioButton::GetValue() const
 {
-    // TODO
-    return FALSE;
+    return m_peer->GetValue() ;
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
-  SetValue ( (event.m_commandInt != 0) );
+  SetValue ( (event.GetInt() != 0) );
   ProcessCommand (event);
 }
 
+wxInt32 wxRadioButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+{
+    // if already set -> no action
+    if ( GetValue() )
+        return noErr;
+
+    wxRadioButton *cycle;
+    cycle=this->NextInCycle();
+    if (cycle!=NULL) {
+        while (cycle!=this) {
+            if ( cycle->GetValue() ) {
+                cycle->SetValue(false);
+            }
+            cycle=cycle->NextInCycle();
+        }
+    }
+
+    SetValue(true) ;
 
+    wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+    event2.SetEventObject(this);
+    event2.SetInt( true );
+    ProcessCommand(event2);
+    return noErr ;
+}
+
+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);
+    }
+}
+
+#endif