Fixed cancelling dialogs in DRAWING_TOOL.

d8768079 · Maciej Suminski · b6aa832f · d8768079
Commit d8768079 authored Apr 03, 2014 by Maciej Suminski
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

tool_dispatcher.cpp common/tool/tool_dispatcher.cpp +5 -5

No files found.
--- a/common/tool/tool_dispatcher.cpp
+++ b/common/tool/tool_dispatcher.cpp
@@ -251,14 +251,14 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )

        if( type == wxEVT_KEY_UP )
        {
-            if( key == WXK_ESCAPE ) // ESC is the special key for cancelling tools
-                evt = TOOL_EVENT( TC_COMMAND, TA_CANCEL_TOOL );
-            else
-                evt = TOOL_EVENT( TC_KEYBOARD, TA_KEY_UP, key | mods );
+            evt = TOOL_EVENT( TC_KEYBOARD, TA_KEY_UP, key | mods );
        }
        else
        {
-            evt = TOOL_EVENT( TC_KEYBOARD, TA_KEY_DOWN, key | mods );
+            if( key == WXK_ESCAPE ) // ESC is the special key for cancelling tools
+                evt = TOOL_EVENT( TC_COMMAND, TA_CANCEL_TOOL );
+            else
+                evt = TOOL_EVENT( TC_KEYBOARD, TA_KEY_DOWN, key | mods );
        }
    }