Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index d3c41879403ca8349293597cbf8b535a21eec909..936b8a54e8a5d11f92cae10e3f1a02e615df023f 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -6,22 +6,16 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // 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"
 
 #include "wx/wxprec.h"
 
 #if wxUSE_RADIOBTN
 
 #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"
 


@@ -32,46 +26,51 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-    m_macIsUserPane = FALSE ;
-    
+    m_macIsUserPane = false ;
+

     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;

-    
+

     m_label = label ;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     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() ) );
         0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) );

-    
+

 
     MacPostControlCreate(pos,size) ;
 
 
     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)
 }
 
 void wxRadioButton::SetValue(bool val)


@@ -79,19 +78,19 @@ void wxRadioButton::SetValue(bool val)
     wxRadioButton *cycle;
     if ( m_peer->GetValue() == val )
         return ;
     wxRadioButton *cycle;
     if ( m_peer->GetValue() == val )
         return ;

-        
+

     m_peer->SetValue( val ) ;
     m_peer->SetValue( val ) ;

-    if (val) 
+    if (val)

     {
         cycle=this->NextInCycle();
     {
         cycle=this->NextInCycle();

-        if (cycle!=NULL) 
+        if (cycle!=NULL)

         {
         {

-           while (cycle!=this) 
-           {
-               cycle->SetValue(false);
-               cycle=cycle->NextInCycle();
-           }
-       }
+            while (cycle!=this)
+            {
+                cycle->SetValue(false);
+                cycle=cycle->NextInCycle();
+            }
+        }

     }
 }
 
     }
 }
 


@@ -106,32 +105,25 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (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() )
 {
     // if already set -> no action
     if ( GetValue() )

-      return noErr;
-      
-      wxRadioButton *cycle, *old = NULL ;
+        return noErr;
+
+    wxRadioButton *cycle;

     cycle=this->NextInCycle();
     if (cycle!=NULL) {
     cycle=this->NextInCycle();
     if (cycle!=NULL) {

-          while (cycle!=this) {
+        while (cycle!=this) {

             if ( cycle->GetValue() ) {
             if ( cycle->GetValue() ) {

-              old = cycle ;

                 cycle->SetValue(false);
                 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 );
     wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
     event2.SetEventObject(this);
     event2.SetInt( true );


@@ -142,19 +134,37 @@ wxInt32 wxRadioButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVE
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
 {
     wxRadioButton *next,*current;
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
 {
     wxRadioButton *next,*current;

-        
-    if (cycle==NULL) {
+
+    if (cycle==NULL)
+    {

         m_cycle=this;
         return(this);
         m_cycle=this;
         return(this);

-        }
-    else {
+    }
+    else
+    {

         current=cycle;
         current=cycle;

-          while ((next=current->m_cycle)!=cycle) 
+        while ((next=current->m_cycle)!=cycle)

             current=current->m_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
 
 #endif