use wxIsSameDouble() and wxIsNullDouble() for warning-less double comparison of doubles

[wxWidgets.git] / src / cocoa / radiobut.mm

diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm
index 5ceef75f9911f50d33225404bd875d1496a90346..2384a73787750df9f8cd6db4c53617e357516159 100644 (file)
--- a/src/cocoa/radiobut.mm
+++ b/src/cocoa/radiobut.mm
@@ -6,10 +6,13 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/16
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#if wxUSE_RADIOBTN
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"


@@ -95,7 +98,7 @@ wxRadioButton::~wxRadioButton()
             m_radioSlaves.GetFirst();
         wxASSERT(slaveNode);
         wxASSERT(slaveNode->GetData() == this);
             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;
     
         // Now find the new master
         wxRadioButton *newMaster = NULL;


@@ -111,7 +114,7 @@ wxRadioButton::~wxRadioButton()
             wxASSERT(radioButton->m_radioMaster == this);
             radioButton->m_radioMaster = newMaster;
             newMaster->m_radioSlaves.Append(radioButton);
             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)
         }
     }
     else if(m_radioMaster)


@@ -140,7 +143,7 @@ bool wxRadioButton::GetValue() const
 
 void wxRadioButton::Cocoa_wxNSButtonAction(void)
 {
 
 void wxRadioButton::Cocoa_wxNSButtonAction(void)
 {

-    wxLogDebug(wxT("wxRadioButton"));
+    wxLogTrace(wxTRACE_COCOA,wxT("wxRadioButton"));

     if(m_radioMaster && ([GetNSButton() state] == NSOnState))
     {
         for(wxRadioButtonList::compatibility_iterator slaveNode =
     if(m_radioMaster && ([GetNSButton() state] == NSOnState))
     {
         for(wxRadioButtonList::compatibility_iterator slaveNode =


@@ -158,3 +161,4 @@ void wxRadioButton::Cocoa_wxNSButtonAction(void)
     Command(event);
 }
 
     Command(event);
 }
 

+#endif