diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/helper/window.cpp | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/helper/window.cpp')
| -rw-r--r-- | src/helper/window.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/helper/window.cpp b/src/helper/window.cpp index 444e1d8b0..98fbef170 100644 --- a/src/helper/window.cpp +++ b/src/helper/window.cpp @@ -12,19 +12,24 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif + +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H +#include <glibmm/threads.h> +#endif + #include <gtkmm/window.h> #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 ? |