Replace all deprecated gdk_keymap_get_default() with Gdk::Display::get_default()->get_keymap().

6 files changed, 16 insertions, 9 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)
diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp
index 6b8d5f0dc..7793c9d4d 100644
--- a/src/ui/tool/event-utils.cpp
+++ b/src/ui/tool/event-utils.cpp
@@ -11,6 +11,7 @@
 #include <cstring>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
+#include <gdkmm/display.h>
 #include "display/sp-canvas.h"
 #include "ui/tool/event-utils.h"
 
@@ -22,7 +23,7 @@ guint shortcut_key(GdkEventKey const &event)
 {
     guint shortcut_key = 0;
     gdk_keymap_translate_keyboard_state(
-            gdk_keymap_get_for_display(gdk_display_get_default()),
+            Gdk::Display::get_default()->get_keymap(),
             event.hardware_keycode,
             (GdkModifierType) event.state,
             0   /*event->key.group*/,
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 587788e39..ce319009b 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -19,6 +19,7 @@
 #endif
 
 #include <gdk/gdkkeysyms.h>
+#include <gdkmm/display.h>
 #include <glibmm/i18n.h>
 
 #include "shortcuts.h"
@@ -1170,7 +1171,7 @@ static void update_latin_keys_group() {
     gint n_keys;
 
     latin_keys_group_valid = FALSE;
-    if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), GDK_KEY_a, &keys, &n_keys)) {
+    if (gdk_keymap_get_entries_for_keyval(Gdk::Display::get_default()->get_keymap(), GDK_KEY_a, &keys, &n_keys)) {
         for (gint i = 0; i < n_keys; i++) {
             if (!latin_keys_group_valid || keys[i].group < latin_keys_group) {
                 latin_keys_group = keys[i].group;
@@ -1185,7 +1186,7 @@ static void update_latin_keys_group() {
  * Initialize Latin keys group handling.
  */
 void init_latin_keys_group() {
-    g_signal_connect(G_OBJECT(gdk_keymap_get_default()),
+    g_signal_connect(G_OBJECT(Gdk::Display::get_default()->get_keymap()),
             "keys-changed", G_CALLBACK(update_latin_keys_group), NULL);
     update_latin_keys_group();
 }
@@ -1202,7 +1203,7 @@ guint get_latin_keyval(GdkEventKey const *event, guint *consumed_modifiers /*= N
     gint group = latin_keys_group_valid ? latin_keys_group : event->group;
 
     gdk_keymap_translate_keyboard_state(
-            gdk_keymap_get_for_display(gdk_display_get_default()),
+            Gdk::Display::get_default()->get_keymap(),
             event->hardware_keycode, (GdkModifierType) event->state, group,
             &keyval, NULL, NULL, &modifiers);
 
diff --git a/src/ui/widget/font-selector-toolbar.cpp b/src/ui/widget/font-selector-toolbar.cpp
index c997e0920..4f951fa62 100644
--- a/src/ui/widget/font-selector-toolbar.cpp
+++ b/src/ui/widget/font-selector-toolbar.cpp
@@ -13,6 +13,7 @@
 
 #include <glibmm/i18n.h>
 #include <glibmm/regex.h>
+#include <gdkmm/display.h>
 
 #include "font-selector-toolbar.h"
 
@@ -259,7 +260,7 @@ FontSelectorToolbar::on_key_press_event (GdkEventKey* key_event)
     bool consumed = false;
 
     unsigned int key = 0;
-    gdk_keymap_translate_keyboard_state( gdk_keymap_get_for_display( gdk_display_get_default() ),
+    gdk_keymap_translate_keyboard_state( Gdk::Display::get_default()->get_keymap(),
                                          key_event->hardware_keycode,
                                          (GdkModifierType)key_event->state,
                                          0, &key, 0, 0, 0 );
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 318e6ced2..e922bcc00 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -48,6 +48,7 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/adjustment.h>
 #include <gdk/gdkkeysyms.h>
+#include <gdkmm/display.h>
 
 #include "widgets/ege-adjustment-action.h"
 #include "ui/icon-names.h"
@@ -1014,7 +1015,7 @@ gboolean keypress_cb( GtkWidget *widget, GdkEventKey *event, gpointer data )
     gboolean wasConsumed = FALSE; /* default to report event not consumed */
     EgeAdjustmentAction* action = EGE_ADJUSTMENT_ACTION(data);
     guint key = 0;
-    gdk_keymap_translate_keyboard_state( gdk_keymap_get_for_display( gdk_display_get_default() ),
+    gdk_keymap_translate_keyboard_state( Gdk::Display::get_default()->get_keymap(),
                                          event->hardware_keycode, (GdkModifierType)event->state,
                                          0, &key, 0, 0, 0 );
 
diff --git a/src/widgets/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp
index 2fecb06a4..133ae7878 100644
--- a/src/widgets/ink-comboboxentry-action.cpp
+++ b/src/widgets/ink-comboboxentry-action.cpp
@@ -29,6 +29,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <gdkmm/display.h>
 
 #include "widgets/ink-comboboxentry-action.h"
 #include "ui/icon-names.h"
@@ -921,7 +922,7 @@ gboolean keypress_cb( GtkWidget * /*widget*/, GdkEventKey *event, gpointer data
     gboolean wasConsumed = FALSE; /* default to report event not consumed */
     guint key = 0;
     Ink_ComboBoxEntry_Action* action = INK_COMBOBOXENTRY_ACTION( data );
-    gdk_keymap_translate_keyboard_state( gdk_keymap_get_for_display( gdk_display_get_default() ),
+    gdk_keymap_translate_keyboard_state( Gdk::Display::get_default()->get_keymap(),
                                          event->hardware_keycode, (GdkModifierType)event->state,
                                          0, &key, 0, 0, 0 );