From 5c8fe17c8310c6d56d4a972d4d5d45223c93bc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Wed, 25 Jun 2014 18:07:06 +0000
Subject: [PATCH] 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
---
 src/msw/toplevel.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 3fe061a126..37b3a3d0a7 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -1572,8 +1572,6 @@ bool wxTopLevelWindowMSW::HandleMenuPopup(wxEventType evtType, WXHMENU hMenu)
     {
         menu = wxCurrentPopupMenu;
         isPopup = true;
-        if ( evtType == wxEVT_MENU_CLOSE )
-            wxCurrentPopupMenu = NULL;
     }
     else
     {