Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxRadioButton::SetValue(true) deselect all other wxRadioButton in its group if it is part of a group.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-07-19 18:00:32 +00:00
parent 4c1a4c4180
commit 18359b1945
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cocoa/radiobut.h
View File

@@ -56,6 +56,8 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
protected: protected:
virtual void Cocoa_wxNSButtonAction(void); virtual void Cocoa_wxNSButtonAction(void);
private:
void Cocoa_DeselectOtherButtonsInTheGroup(void);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Implementation // Implementation
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

22
src/cocoa/radiobut.mm
View File

@@ -130,7 +130,10 @@ wxRadioButton::~wxRadioButton()
void wxRadioButton::SetValue(bool value) void wxRadioButton::SetValue(bool value)
{ {
if(value) if(value)
{
[GetNSButton() setState: NSOnState]; [GetNSButton() setState: NSOnState];
Cocoa_DeselectOtherButtonsInTheGroup();
}
else else
[GetNSButton() setState: NSOffState]; [GetNSButton() setState: NSOffState];
} }
@@ -142,10 +145,14 @@ bool wxRadioButton::GetValue() const
return state==NSOnState; return state==NSOnState;
} }
void wxRadioButton::Cocoa_wxNSButtonAction(void) /**
* 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)
{ {
wxLogTrace(wxTRACE_COCOA,wxT("wxRadioButton")); if(m_radioMaster)
if(m_radioMaster && ([GetNSButton() state] == NSOnState))
{ {
for(wxRadioButtonList::compatibility_iterator slaveNode = for(wxRadioButtonList::compatibility_iterator slaveNode =
m_radioMaster->m_radioSlaves.GetFirst(); m_radioMaster->m_radioSlaves.GetFirst();
@@ -156,6 +163,15 @@ void wxRadioButton::Cocoa_wxNSButtonAction(void)
radioButton->SetValue(false); 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()); wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
InitCommandEvent(event); // event.SetEventObject(this); InitCommandEvent(event); // event.SetEventObject(this);
event.SetInt(GetValue()); event.SetInt(GetValue());