AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Let the menubar see a menu's keyboard events, and reset menus on dismiss.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-05-18 21:36:13 +00:00
parent aaf996e5ef
commit d8809820cc
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/univ/menu.cpp
View File

@ -482,6 +482,8 @@ void wxPopupMenuWindow::Dismiss()
}
wxPopupTransientWindow::Dismiss();
ResetCurrent();
}
void wxPopupMenuWindow::OnDismiss()
@ -491,19 +493,13 @@ void wxPopupMenuWindow::OnDismiss()
HandleDismiss(true);
}
void wxPopupMenuWindow::OnSubmenuDismiss(bool dismissParent)
void wxPopupMenuWindow::OnSubmenuDismiss(bool WXUNUSED(dismissParent))
{
m_hasOpenSubMenu = false;
// we are closing whole menu so remove current highlight
if ( dismissParent )
ResetCurrent();
}
void wxPopupMenuWindow::HandleDismiss(bool dismissParent)
{
ResetCurrent();
m_menu->OnDismiss(dismissParent);
}
@ -875,7 +871,13 @@ void wxPopupMenuWindow::OnMouseLeave(wxMouseEvent& event)
void wxPopupMenuWindow::OnKeyDown(wxKeyEvent& event)
{
if ( !ProcessKeyDown(event.GetKeyCode()) )
wxMenuBar *menubar = m_menu->GetMenuBar();
if ( menubar )
{
menubar->ProcessEvent(event);
}
else if ( !ProcessKeyDown(event.GetKeyCode()) )
{
event.Skip();
}
@ -2480,7 +2482,7 @@ void wxMenuBar::OnDismiss()
{
if ( ReleaseMouseCapture() )
wxLogTrace(_T("mousecapture"), _T("Releasing mouse from wxMenuBar::OnDismiss"));
if ( m_current != -1 )
{
size_t current = m_current;
@ -2513,7 +2515,7 @@ bool wxMenuBar::ReleaseMouseCapture()
if ( had )
ReleaseMouse();
capture->CaptureMouse();
return had;