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

wxRadioButtons in the same group no longer have to be consecutive

Browse Source 
(there may be intervening controls). Without this fix, an out-of-sync
assert is generated when clicking on a radio button and then calling
GetValue().


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-10-18 20:20:47 +00:00
parent f31424dbe9
commit c5b3143a47
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -227,6 +227,7 @@ wxMac:
wxMSW:
- fixed enhanced metafiles loading from files (Andreas Goebel)
- Group of wxRadioButtons no longer have to be consecutive
2.5.3

27
src/msw/radiobut.cpp
View File

@@ -182,20 +182,22 @@ void wxRadioButton::SetValue(bool value)
{
wxRadioButton *btn = wxDynamicCast(nodeBefore->GetData(),
wxRadioButton);
if ( !btn )
if ( btn && btn->HasFlag(wxRB_SINGLE) )
{
// the radio buttons in a group must be consecutive, so
// there are no more of them
// A wxRB_SINGLE button isn't part of this group
break;
}
btn->SetValue(false);
if ( btn->HasFlag(wxRB_GROUP) )
if (btn)
{
// even if there are other radio buttons before this one,
// they're not in the same group with us
break;
btn->SetValue(false);
if ( btn->HasFlag(wxRB_GROUP) )
{
// even if there are other radio buttons before this one,
// they're not in the same group with us
break;
}
}
}
}
@@ -208,13 +210,14 @@ void wxRadioButton::SetValue(bool value)
wxRadioButton *btn = wxDynamicCast(nodeAfter->GetData(),
wxRadioButton);
if ( !btn || btn->HasFlag(wxRB_GROUP) )
if ( btn && (btn->HasFlag(wxRB_GROUP) || btn->HasFlag(wxRB_SINGLE) ) )
{
// no more buttons or the first button of the next group
break;
}
btn->SetValue(false);
if (btn)
btn->SetValue(false);
}
}
}