X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5e84126fcb673217660170ab871738f21972b49..2d956b58023a4955313a1c1531bc70a0deb0b831:/src/msw/window.cpp?ds=sidebyside

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 8bb6886ec3..77589902e5 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2036,10 +2036,18 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
         }
 #endif // 1/0
 
-        if ( ::IsDialogMessage(GetHwnd(), msg) )
+        // we handle VK_ESCAPE ourselves in wxDialog::OnCharHook() and we
+        // shouldn't let IsDialogMessage() get it as it _always_ eats the
+        // message even when there is no cancel button and when the message is
+        // needed by the control itself: in particular, it prevents the tree in
+        // place edit control from being closed with Escape in a dialog
+        if ( msg->message != WM_KEYDOWN || msg->wParam != VK_ESCAPE )
         {
-            // IsDialogMessage() did something...
-            return TRUE;
+            if ( ::IsDialogMessage(GetHwnd(), msg) )
+            {
+                // IsDialogMessage() did something...
+                return TRUE;
+            }
         }
     }
 #endif // __WXUNIVERSAL__