From cad2b9cbfdc3804bd66d38957cab6cd4180f8d04 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:04:03 +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/trunk@76773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/window.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index a8d21b72bc..12655d3c1a 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2335,8 +2335,6 @@ bool wxWindowMSW::HandleMenuPopup(wxEventType evtType, WXHMENU hMenu)
     {
         menu = wxCurrentPopupMenu;
         isPopup = true;
-        if ( evtType == wxEVT_MENU_CLOSE )
-            wxCurrentPopupMenu = NULL;
     }
     else
     {