X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/911e17c6cf31c0e9e7ab4cdb8e03d66203ebbab8..ef419e3b4550534df66e25c034a9babbcef54b92:/src/cocoa/radiobut.mm?ds=inline

diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm
index d5502f3d38..caaa25001e 100644
--- a/src/cocoa/radiobut.mm
+++ b/src/cocoa/radiobut.mm
@@ -1,19 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/radiobut.mm
+// Name:        src/cocoa/radiobut.mm
 // Purpose:     wxRadioButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#if wxUSE_RADIOBTN
+
+#include "wx/radiobut.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
-    #include "wx/radiobut.h"
 #endif //WX_PRECOMP
 
 #import <AppKit/NSButton.h>
@@ -60,7 +64,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID winid,
             {
                 m_radioMaster = radioButton->m_radioMaster;
                 wxASSERT_MSG(m_radioMaster,
-                    "Previous radio button should be part of a group");
+                    wxT("Previous radio button should be part of a group"));
                 // Don't crash, assume user meant wxRB_SINGLE
                 if(m_radioMaster)
                     m_radioMaster->m_radioSlaves.Append(this);
@@ -95,14 +99,14 @@ wxRadioButton::~wxRadioButton()
             m_radioSlaves.GetFirst();
         wxASSERT(slaveNode);
         wxASSERT(slaveNode->GetData() == this);
-        m_radioSlaves.DeleteNode(slaveNode);
-    
+        m_radioSlaves.Erase(slaveNode);
+
         // Now find the new master
         wxRadioButton *newMaster = NULL;
         slaveNode = m_radioSlaves.GetFirst();
         if(slaveNode)
             newMaster = slaveNode->GetData();
-    
+
         // For each node (including the new master) set the master, remove
         // it from this list, and add it to the new master's list
         for(; slaveNode; slaveNode = m_radioSlaves.GetFirst())
@@ -111,7 +115,7 @@ wxRadioButton::~wxRadioButton()
             wxASSERT(radioButton->m_radioMaster == this);
             radioButton->m_radioMaster = newMaster;
             newMaster->m_radioSlaves.Append(radioButton);
-            m_radioSlaves.DeleteNode(slaveNode);
+            m_radioSlaves.Erase(slaveNode);
         }
     }
     else if(m_radioMaster)
@@ -140,7 +144,7 @@ bool wxRadioButton::GetValue() const
 
 void wxRadioButton::Cocoa_wxNSButtonAction(void)
 {
-    wxLogDebug("wxRadioButton");
+    wxLogTrace(wxTRACE_COCOA,wxT("wxRadioButton"));
     if(m_radioMaster && ([GetNSButton() state] == NSOnState))
     {
         for(wxRadioButtonList::compatibility_iterator slaveNode =
@@ -158,3 +162,4 @@ void wxRadioButton::Cocoa_wxNSButtonAction(void)
     Command(event);
 }
 
+#endif