/////////////////////////////////////////////////////////////////////////////
-// 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: wxWindows 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>
WX_DEFINE_LIST(wxRadioButtonList);
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
// wxRadioButtonBase == wxControl
BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
END_EVENT_TABLE()
{
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);
SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
[m_cocoaNSView release];
[GetNSButton() setButtonType: NSRadioButton];
- [GetNSButton() setTitle:wxNSStringWithWxString(label)];
+ CocoaSetLabelForObject(label, GetNSButton());
// If it's the first in a group, it should be selected
if(style&wxRB_GROUP)
[GetNSButton() setState: NSOnState];
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())
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)
m_radioMaster = NULL;
}
// normal stuff
- DisassociateNSButton(m_cocoaNSView);
+ DisassociateNSButton(GetNSButton());
}
void wxRadioButton::SetValue(bool value)
{
if(value)
+ {
[GetNSButton() setState: NSOnState];
+ Cocoa_DeselectOtherButtonsInTheGroup();
+ }
else
[GetNSButton() setState: NSOffState];
}
return state==NSOnState;
}
-void wxRadioButton::Cocoa_wxNSButtonAction(void)
+void wxRadioButton::SetLabel(const wxString& label)
+{
+ wxAutoNSAutoreleasePool pool;
+ CocoaSetLabelForObject(label, GetNSButton());
+}
+
+wxString wxRadioButton::GetLabel() const
+{
+ return wxStringWithNSString([GetNSButton() title]);
+}
+
+/**
+ * If this radio button is part of a group, this method turns off every other
+ * button in the group. If this radio button is not part of a group, this
+ * method does absolutely nothing.
+ */
+void wxRadioButton::Cocoa_DeselectOtherButtonsInTheGroup(void)
{
- wxLogDebug("wxRadioButton");
- if(m_radioMaster && ([GetNSButton() state] == NSOnState))
+ if(m_radioMaster)
{
for(wxRadioButtonList::compatibility_iterator slaveNode =
m_radioMaster->m_radioSlaves.GetFirst();
radioButton->SetValue(false);
}
}
+}
+
+void wxRadioButton::Cocoa_wxNSButtonAction(void)
+{
+ wxLogTrace(wxTRACE_COCOA,wxT("wxRadioButton"));
+ if([GetNSButton() state] == NSOnState)
+ {
+ Cocoa_DeselectOtherButtonsInTheGroup();
+ }
wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
InitCommandEvent(event); // event.SetEventObject(this);
event.SetInt(GetValue());
Command(event);
}
+#endif