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

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 46014e4576..936b8a54e8 100644
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -6,20 +6,16 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "radiobut.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/defs.h"
+#if wxUSE_RADIOBTN
 
 #include "wx/radiobut.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 
@@ -30,65 +26,77 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
-    Rect bounds ;
-    Str255 title ;
-    
-    MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
-
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
-          kControlRadioButtonProc , (long) this ) ;
-    
-    MacPostControlCreate() ;
-
-  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)
+    m_macIsUserPane = false ;
+
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    m_label = label ;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+    m_peer = new wxMacControl(this) ;
+    verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
+        0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) );
+
+
+    MacPostControlCreate(pos,size) ;
+
+    m_cycle = this ;
+
+    if (HasFlag(wxRB_GROUP))
     {
-      wxWindow *child = node->GetData();
-      if (child->IsKindOf( CLASSINFO( wxRadioButton ) ) )
-      {
-          chief = (wxRadioButton*) child;
-         if (child->HasFlag(wxRB_GROUP)) break;
-      }
-      node = node->GetPrevious();
+        AddInCycle( NULL ) ;
     }
-    AddInCycle( chief ) ;
-  }
-    return TRUE;
+    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;
+}
+
+wxRadioButton::~wxRadioButton()
+{
+    RemoveFromCycle();
 }
 
 void wxRadioButton::SetValue(bool val)
 {
     wxRadioButton *cycle;
-      if ( GetControl32BitValue( (ControlHandle) m_macControl ) == val )
+    if ( m_peer->GetValue() == val )
         return ;
-        
-   ::SetControl32BitValue( (ControlHandle) m_macControl , val ) ;
-   if (val) 
-   {
-           cycle=this->NextInCycle();
-          if (cycle!=NULL) {
-               while (cycle!=this) {
-                   cycle->SetValue(false);
-                   cycle=cycle->NextInCycle();
-                   }
-               }
-           }
-   MacRedrawControl() ;
+
+    m_peer->SetValue( val ) ;
+    if (val)
+    {
+        cycle=this->NextInCycle();
+        if (cycle!=NULL)
+        {
+            while (cycle!=this)
+            {
+                cycle->SetValue(false);
+                cycle=cycle->NextInCycle();
+            }
+        }
+    }
 }
 
 bool wxRadioButton::GetValue() const
 {
-    return ::GetControl32BitValue( (ControlHandle) m_macControl ) ;
+    return m_peer->GetValue() ;
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
@@ -97,51 +105,66 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
-void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+wxInt32 wxRadioButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
 {
+    // if already set -> no action
     if ( GetValue() )
-      return ;
-      
-      wxRadioButton *cycle, *old = NULL ;
+        return noErr;
+
+    wxRadioButton *cycle;
     cycle=this->NextInCycle();
     if (cycle!=NULL) {
-          while (cycle!=this) {
+        while (cycle!=this) {
             if ( cycle->GetValue() ) {
-              old = cycle ;
                 cycle->SetValue(false);
-              }
-              cycle=cycle->NextInCycle();
             }
+            cycle=cycle->NextInCycle();
+        }
     }
 
-      SetValue(true) ;
+    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);
+    return noErr ;
 }
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
 {
     wxRadioButton *next,*current;
-        
-    if (cycle==NULL) {
+
+    if (cycle==NULL)
+    {
         m_cycle=this;
         return(this);
-        }
-    else {
+    }
+    else
+    {
         current=cycle;
-          while ((next=current->m_cycle)!=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);
+    }
+}
+
+void wxRadioButton::RemoveFromCycle()
+{        
+    if (m_cycle==NULL || m_cycle == this)
+    {
+        return;
+    }
+    else
+    {
+        // Find the previous one and make it point to the next one
+        wxRadioButton* prev = this;
+        while (prev->m_cycle != this)
+            prev = prev->m_cycle;
+        prev->m_cycle = m_cycle;
+    }
+}
+
+#endif