diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-12 21:21:23 +0000 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-12 21:37:05 +0000 |
| commit | 216266f2ad3b8ff5d5afd3e1d0dc3e20308e01d6 (patch) | |
| tree | 848a75a1cdf49364e900dcfc0fd3109009adedc0 /src/shortcuts.cpp | |
| parent | Make ToolBase::cursor use gdkmm and smart pointers. (diff) | |
| download | inkscape-216266f2ad3b8ff5d5afd3e1d0dc3e20308e01d6.tar.gz inkscape-216266f2ad3b8ff5d5afd3e1d0dc3e20308e01d6.zip | |
Replace all deprecated gdk_keymap_get_default() with Gdk::Display::get_default()->get_keymap().
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) |