X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d1a4878f36ba4b5f66c2ccfd2cb27a9dc528b6f..6e644ef2d35230f9d4a5c0bb89b98edd3e4d6c69:/src/mac/carbon/radiobut.cpp?ds=inline

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 3fd1a3fae2..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
 /////////////////////////////////////////////////////////////////////////////
 
-#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"
 
@@ -30,66 +26,72 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
-    m_macIsUserPane = FALSE ;
-    
+    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() ;
-    verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
+
+    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))
-  {
-      AddInCycle( NULL ) ;
-  }
-  else
-  {
-    /* search backward for last group start */
-    wxRadioButton *chief = (wxRadioButton*) NULL;
-    wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
-    while (node)
+    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 ( m_peer->GetValue() == val )
+    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();
-                   }
-               }
-           }
-   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
@@ -103,32 +105,25 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
-wxInt32 wxRadioButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )  
+wxInt32 wxRadioButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
 {
     // if already set -> no action
     if ( GetValue() )
-      return noErr;
-      
-      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 );
@@ -139,17 +134,37 @@ wxInt32 wxRadioButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVE
 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