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

don't send the events for the radio menu items being unchecked

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-26 14:09:55 +00:00
parent 74a787a11e
commit 705dd80af1
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/menu.cpp
View File

@@ -621,21 +621,25 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
if (item->IsCheckable()) if (item->IsCheckable())
{ {
bool isReallyChecked = item->IsChecked(); bool isReallyChecked = item->IsChecked(),
if ( item->wxMenuItemBase::IsChecked() == isReallyChecked ) isInternallyChecked = item->wxMenuItemBase::IsChecked();
// ensure that the internal state is always consistent with what is
// shown on the screen
item->wxMenuItemBase::Check(isReallyChecked);
// we must not report the events for the radio button going up nor the
// events resulting from the calls to wxMenuItem::Check()
if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
(isInternallyChecked == isReallyChecked) )
{ {
/* the menu item has been checked by calling wxMenuItem->Check() */
return; return;
} }
else
{ // the user pressed on the menu item: report the event below
/* the user pressed on the menu item -> report and make consistent
* again */
item->wxMenuItemBase::Check(isReallyChecked);
}
} }
menu->SendEvent(item->GetId(), item->IsCheckable() ? item->IsChecked() : -1); menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

24
src/gtk1/menu.cpp
View File

@@ -621,21 +621,25 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
if (item->IsCheckable()) if (item->IsCheckable())
{ {
bool isReallyChecked = item->IsChecked(); bool isReallyChecked = item->IsChecked(),
if ( item->wxMenuItemBase::IsChecked() == isReallyChecked ) isInternallyChecked = item->wxMenuItemBase::IsChecked();
// ensure that the internal state is always consistent with what is
// shown on the screen
item->wxMenuItemBase::Check(isReallyChecked);
// we must not report the events for the radio button going up nor the
// events resulting from the calls to wxMenuItem::Check()
if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
(isInternallyChecked == isReallyChecked) )
{ {
/* the menu item has been checked by calling wxMenuItem->Check() */
return; return;
} }
else
{ // the user pressed on the menu item: report the event below
/* the user pressed on the menu item -> report and make consistent
* again */
item->wxMenuItemBase::Check(isReallyChecked);
}
} }
menu->SendEvent(item->GetId(), item->IsCheckable() ? item->IsChecked() : -1); menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------