X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/449c567346a1b3937e532cd87aac007faad76b04..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/cocoa/radiobut.mm diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm index f45413d919..4962d81f45 100644 --- a/src/cocoa/radiobut.mm +++ b/src/cocoa/radiobut.mm @@ -6,7 +6,7 @@ // Created: 2003/03/16 // RCS-ID: $Id: // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -60,7 +60,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,7 +95,7 @@ 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; @@ -111,7 +111,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) @@ -120,7 +120,7 @@ wxRadioButton::~wxRadioButton() m_radioMaster = NULL; } // normal stuff - DisassociateNSButton(m_cocoaNSView); + DisassociateNSButton(GetNSButton()); } void wxRadioButton::SetValue(bool value) @@ -140,7 +140,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 =