diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-13 00:00:04 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-13 00:00:04 +0000 |
| commit | 152a0caf7e216e7ceafeed20822500c385e3e2df (patch) | |
| tree | a3b5d60e08f3bd8221ba2e50eea80b087e5d541a /src/helper/window.cpp | |
| parent | Update to trunk (diff) | |
| parent | fix C++11 compilation. There A LOT of const_casts in this file... :-( (diff) | |
| download | inkscape-152a0caf7e216e7ceafeed20822500c385e3e2df.tar.gz inkscape-152a0caf7e216e7ceafeed20822500c385e3e2df.zip | |
Update to trunk
(bzr r12588.1.26)
Diffstat (limited to 'src/helper/window.cpp')
| -rw-r--r-- | src/helper/window.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/helper/window.cpp b/src/helper/window.cpp index cf6fb12ec..98fbef170 100644 --- a/src/helper/window.cpp +++ b/src/helper/window.cpp @@ -22,14 +22,14 @@ #include "inkscape.h" #include "shortcuts.h" #include "desktop.h" -#include "event-context.h" +#include "ui/tools/tool-base.h" #include "window.h" #include <gtk/gtk.h> static bool on_window_key_press(GdkEventKey* event) { unsigned int shortcut; - shortcut = get_group0_keyval (event) | + shortcut = Inkscape::UI::Tools::get_group0_keyval (event) | ( event->state & GDK_SHIFT_MASK ? SP_SHORTCUT_SHIFT_MASK : 0 ) | ( event->state & GDK_CONTROL_MASK ? |