Revert wxCurrentPopupMenu clearing in HandleMenuPopup().

WM_COMMAND is delivered after WM_UNINITMENUPOPUP and clearing
wxCurrentPopupMenu in the latter's handler broke delivery of the command
event to the wxTextCtrl control.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2014-06-25 18:07:06 +00:00
parent 29d46b6d58
commit 5c8fe17c83

View File

@@ -1572,8 +1572,6 @@ bool wxTopLevelWindowMSW::HandleMenuPopup(wxEventType evtType, WXHMENU hMenu)
{ {
menu = wxCurrentPopupMenu; menu = wxCurrentPopupMenu;
isPopup = true; isPopup = true;
if ( evtType == wxEVT_MENU_CLOSE )
wxCurrentPopupMenu = NULL;
} }
else else
{ {