X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/facd6764872eede45605ba7c9dfa0e1d0c708fa2..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/radiobut.cpp?ds=inline

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index c7101f60ad..7f866d2536 100644
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -2,150 +2,177 @@
 // Name:        radiobut.cpp
 // Purpose:     wxRadioButton
 // Author:      AUTHOR
-// Modified by: JS Lair (99/11/15) adding the cyclic groupe notion for radiobox
+// Modified by: JS Lair (99/11/15) adding the cyclic group notion for radiobox
 // 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"
+#include "wx/mac/uma.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 wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxRadioButton::Create( wxWindow *parent,
+    wxWindowID id,
+    const wxString& label,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxValidator& validator,
+    const wxString& name )
 {
-    m_macIsUserPane = FALSE ;
-    
-    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+    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_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, 
-          kControlRadioButtonProc , (long) this ) ;
-    
-    MacPostControlCreate(pos,size) ;
-
-  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_labelOrig = m_label = label;
+
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateRadioButtonControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, CFSTR(""),
+        0, false /* no autotoggle */, m_peer->GetControlRefAddr() );
+    verify_noerr( err );
+
+    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 = 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( (ControlRef) m_macControl ) == val )
-        return ;
-        
-   ::SetControl32BitValue( (ControlRef) m_macControl , val ) ;
-   if (val) 
-   {
-           cycle=this->NextInCycle();
-          if (cycle!=NULL) {
-               while (cycle!=this) {
-                   cycle->SetValue(false);
-                   cycle=cycle->NextInCycle();
-                   }
-               }
-           }
-   MacRedrawControl() ;
+    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();
+            }
+        }
+    }
 }
 
 bool wxRadioButton::GetValue() const
 {
-    return ::GetControl32BitValue( (ControlRef) m_macControl ) ;
+    return m_peer->GetValue();
 }
 
-void wxRadioButton::Command (wxCommandEvent & event)
+void wxRadioButton::Command(wxCommandEvent& event)
 {
-  SetValue ( (event.GetInt() != 0) );
-  ProcessCommand (event);
+    SetValue( (event.GetInt() != 0) );
+    ProcessCommand( event );
 }
 
-void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) 
+wxInt32 wxRadioButton::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler), WXEVENTREF WXUNUSED(event) )
 {
-    if ( GetValue() )
-      return ;
-      
-      wxRadioButton *cycle, *old = NULL ;
-    cycle=this->NextInCycle();
-    if (cycle!=NULL) {
-          while (cycle!=this) {
-            if ( cycle->GetValue() ) {
-              old = cycle ;
-                cycle->SetValue(false);
-              }
-              cycle=cycle->NextInCycle();
-            }
-    }
+    // if already set -> no action
+    if (GetValue())
+        return noErr;
 
-      SetValue(true) ;
+    wxRadioButton *cycle;
+    cycle = this->NextInCycle();
+    if (cycle != NULL)
+    {
+        while (cycle != this)
+        {
+            if (cycle->GetValue())
+                cycle->SetValue( false );
 
-    if ( old ) {
-      wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, old->m_windowId );
-      event.SetEventObject(old);
-      event.SetInt( false );
-      old->ProcessCommand(event);
+            cycle = cycle->NextInCycle();
+        }
     }
-    wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
-    event2.SetEventObject(this);
+
+    SetValue( true );
+
+    wxCommandEvent event2( wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+    event2.SetEventObject( this );
     event2.SetInt( true );
-    ProcessCommand(event2);
+    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);
-      }
-}  
+    wxRadioButton *current;
+
+    if (cycle == NULL)
+    {
+        m_cycle = this;
+    }
+    else
+    {
+        current = cycle;
+        while (current->m_cycle != cycle)
+            current = current->m_cycle;
+
+        m_cycle = cycle;
+        current->m_cycle = this;
+    }
+
+    return m_cycle;
+}
+
+void wxRadioButton::RemoveFromCycle()
+{        
+    if ((m_cycle == NULL) || (m_cycle == this))
+        return;
+
+    // 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