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

fix for toolbar radio buttons event generation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-26 16:23:35 +00:00
parent 38762f09cd
commit f3ba93c1f0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/tbar95.cpp
View File

@@ -630,6 +630,8 @@ bool wxToolBar::Realize()
// default to be consistent with wxGTK and the menu // default to be consistent with wxGTK and the menu
// radio items // radio items
button.fsState |= TBSTATE_CHECKED; button.fsState |= TBSTATE_CHECKED;
tool->Toggle(TRUE);
} }
isRadio = TRUE; isRadio = TRUE;
@@ -829,6 +831,13 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
bool toggled = tool->IsToggled(); bool toggled = tool->IsToggled();
// avoid sending the event when a radio button is released, this is not
// interesting
if ( tool->CanBeToggled() && tool->GetKind() == wxITEM_RADIO && !toggled )
{
return;
}
// OnLeftClick() can veto the button state change - for buttons which may // OnLeftClick() can veto the button state change - for buttons which may
// be toggled only, of couse // be toggled only, of couse
if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() ) if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )