Skip the menu events in wxFrameBase handlers.

While wxFrame may process these events for its own purposes, it shouldn't
prevent the user-defined fall back handlers for them (e.g. at wxApp level)
from running.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-10-20 22:06:46 +00:00
parent 0c359fa476
commit a8e0d97e0e

View File

@@ -328,6 +328,8 @@ void wxFrameBase::UpdateWindowUI(long flags)
void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
{
event.Skip();
#if wxUSE_STATUSBAR
(void)ShowMenuHelp(event.GetMenuId());
#endif // wxUSE_STATUSBAR
@@ -335,6 +337,8 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
{
event.Skip();
if ( !ShouldUpdateMenuFromIdle() )
{
// as we didn't update the menus from idle time, do it now
@@ -342,8 +346,10 @@ void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
}
}
void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
void wxFrameBase::OnMenuClose(wxMenuEvent& event)
{
event.Skip();
DoGiveHelp(wxEmptyString, false);
}