Fixed MDI context menu event handling problem (Stefan Kowski)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8bdc493773
commit
7dbe942aaa
@ -44,6 +44,7 @@ wxMSW:
|
||||
- wxFileDialog respects absence of wxCHANGE_DIR flag under NT (Brad Anderson).
|
||||
- Switching page of a hidden notebook doesn't lose focus (Jamie Gadd).
|
||||
- Removed wxImageList *GetImageList(int) const.
|
||||
- Fixed MDI context menu problem.
|
||||
|
||||
wxGTK:
|
||||
|
||||
|
@ -545,6 +545,14 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
|
||||
return win->MSWCommand(cmd, id);
|
||||
}
|
||||
|
||||
if (wxCurrentPopupMenu)
|
||||
{
|
||||
wxMenu *popupMenu = wxCurrentPopupMenu;
|
||||
wxCurrentPopupMenu = NULL;
|
||||
if (popupMenu->MSWCommand(cmd, id))
|
||||
return true;
|
||||
}
|
||||
|
||||
// is it one of standard MDI commands?
|
||||
WXWPARAM wParam = 0;
|
||||
WXLPARAM lParam = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user