X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/911e17c6cf31c0e9e7ab4cdb8e03d66203ebbab8..4837b89e3b9ddc02a752d9937e3e1d9f92328851:/src/cocoa/radiobut.mm diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm index d5502f3d38..2384a73787 100644 --- 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 -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#if wxUSE_RADIOBTN + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" @@ -60,7 +63,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 +98,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 +114,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 +143,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 +161,4 @@ void wxRadioButton::Cocoa_wxNSButtonAction(void) Command(event); } +#endif