X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16c81607bfe8b01224ab42a842be208acf74abdd..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/cocoa/radiobut.mm?ds=inline diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm index 2384a73787..70820d4a18 100644 --- a/src/cocoa/radiobut.mm +++ b/src/cocoa/radiobut.mm @@ -1,22 +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: wxWidgets licence +// 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 @@ -27,7 +28,6 @@ WX_DEFINE_LIST(wxRadioButtonList); -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) // wxRadioButtonBase == wxControl BEGIN_EVENT_TABLE(wxRadioButton, wxControl) END_EVENT_TABLE() @@ -76,7 +76,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID winid, 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]; @@ -99,13 +99,13 @@ wxRadioButton::~wxRadioButton() wxASSERT(slaveNode); wxASSERT(slaveNode->GetData() == this); 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()) @@ -129,7 +129,10 @@ wxRadioButton::~wxRadioButton() void wxRadioButton::SetValue(bool value) { if(value) + { [GetNSButton() setState: NSOnState]; + Cocoa_DeselectOtherButtonsInTheGroup(); + } else [GetNSButton() setState: NSOffState]; } @@ -141,10 +144,25 @@ bool wxRadioButton::GetValue() const return state==NSOnState; } -void wxRadioButton::Cocoa_wxNSButtonAction(void) +void wxRadioButton::SetLabel(const wxString& label) { - wxLogTrace(wxTRACE_COCOA,wxT("wxRadioButton")); - if(m_radioMaster && ([GetNSButton() state] == NSOnState)) + 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) +{ + if(m_radioMaster) { for(wxRadioButtonList::compatibility_iterator slaveNode = m_radioMaster->m_radioSlaves.GetFirst(); @@ -155,7 +173,16 @@ void wxRadioButton::Cocoa_wxNSButtonAction(void) radioButton->SetValue(false); } } - wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId()); +} + +void wxRadioButton::Cocoa_wxNSButtonAction(void) +{ + wxLogTrace(wxTRACE_COCOA,wxT("wxRadioButton")); + if([GetNSButton() state] == NSOnState) + { + Cocoa_DeselectOtherButtonsInTheGroup(); + } + wxCommandEvent event(wxEVT_RADIOBUTTON, GetId()); InitCommandEvent(event); // event.SetEventObject(this); event.SetInt(GetValue()); Command(event);