From c4cd8712cda832bdff40e7f4ee208c1075d9157d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 9 Jun 2007 10:50:40 +0000 Subject: [PATCH] cancel dragging if Esc is pressed (patch 1733657) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/treectrl.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 8b3b1a2f57..f3733657d9 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -2335,6 +2335,24 @@ wxTreeCtrl::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) if ( wParam == VK_SPACE || wParam == VK_RETURN ) return 0; } +#if wxUSE_DRAGIMAGE + else if ( nMsg == WM_KEYDOWN ) + { + if ( wParam == VK_ESCAPE ) + { + if ( m_dragImage ) + { + m_dragImage->EndDrag(); + delete m_dragImage; + m_dragImage = NULL; + + // if we don't do it, the tree seems to think that 2 items + // are selected simultaneously which is quite weird + TreeView_SelectDropTarget(GetHwnd(), 0); + } + } + } +#endif // wxUSE_DRAGIMAGE return wxControl::MSWDefWindowProc(nMsg, wParam, lParam); } -- 2.47.2