diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-06-14 18:19:38 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-06-14 18:19:38 +0000 |
| commit | 19bad0b6b3690bbeb287c64e5a30d7aabe015f4f (patch) | |
| tree | 313c22f5dbb5c71bbc85a81f397debeaa790eb36 /src/shortcuts.cpp | |
| parent | Merge branch 'GermanTranslation' of gitlab.com:der-Michael/inkscape (diff) | |
| parent | Make shutdown dialogs use gtkmm. (diff) | |
| download | inkscape-19bad0b6b3690bbeb287c64e5a30d7aabe015f4f.tar.gz inkscape-19bad0b6b3690bbeb287c64e5a30d7aabe015f4f.zip | |
Merge branch 'gdkmm' of gitlab.com:linkmauve/inkscape
Diffstat (limited to 'src/shortcuts.cpp')
| -rw-r--r-- | src/shortcuts.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index 96008dbeb..5c2aa3e39 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -27,6 +27,7 @@ #include "shortcuts.h" #include <gdk/gdkkeysyms.h> +#include <gdkmm/display.h> #include <gtk/gtk.h> #include <glibmm/i18n.h> @@ -687,9 +688,10 @@ static void read_shortcuts_file(char const *filename, bool const is_user_set) { } else if (!strcmp(mod, "Meta")) { modifiers |= SP_SHORTCUT_META_MASK; } else if (!strcmp(mod, "Primary")) { + GdkKeymap* keymap = Gdk::Display::get_default()->get_keymap(); GdkModifierType mod = - gdk_keymap_get_modifier_mask (gdk_keymap_get_default(), GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR); - gdk_keymap_add_virtual_modifiers(gdk_keymap_get_default(), &mod); + gdk_keymap_get_modifier_mask (keymap, GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR); + gdk_keymap_add_virtual_modifiers(keymap, &mod); if (mod & GDK_CONTROL_MASK) modifiers |= SP_SHORTCUT_CONTROL_MASK; else if (mod & GDK_META_MASK) |