[gimp/gtk3-port: 397/444] app: get rid of gdk_keymap_get_default(), use get_for_display() instead

[Michael Natterer <mitch src gnome org>]

commit b933af3a8c756fb4c8aee4bc875f4fe96e4efa3c
Author: Michael Natterer <mitch gimp org>
Date:   Thu May 10 18:41:22 2018 +0200

    app: get rid of gdk_keymap_get_default(), use get_for_display() instead

 app/widgets/gimpcontrollerkeyboard.c |    3 +--
 app/widgets/gimpcontrollermouse.c    |    3 +--
 app/widgets/gimpcontrollerwheel.c    |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/app/widgets/gimpcontrollerkeyboard.c b/app/widgets/gimpcontrollerkeyboard.c
index 6f973b8..c8c1b46 100644
--- a/app/widgets/gimpcontrollerkeyboard.c
+++ b/app/widgets/gimpcontrollerkeyboard.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <gegl.h>
-#undef GDK_MULTIHEAD_SAFE /* for gdk_keymap_get_default() */
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -191,7 +190,7 @@ gimp_controller_keyboard_init (GimpControllerKeyboard *keyboard)
 
   if (! event_names_initialized)
     {
-      GdkKeymap *keymap = gdk_keymap_get_default ();
+      GdkKeymap *keymap = gdk_keymap_get_for_display (gdk_display_get_default ());
       gint       i;
 
       for (i = 0; i < G_N_ELEMENTS (keyboard_events); i++)
diff --git a/app/widgets/gimpcontrollermouse.c b/app/widgets/gimpcontrollermouse.c
index 9e3b908..c0b8c65 100644
--- a/app/widgets/gimpcontrollermouse.c
+++ b/app/widgets/gimpcontrollermouse.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <gegl.h>
-#undef GDK_MULTIHEAD_SAFE /* for gdk_keymap_get_default() */
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"
@@ -216,7 +215,7 @@ gimp_controller_mouse_init (GimpControllerMouse *mouse)
 
   if (! event_names_initialized)
     {
-      GdkKeymap *keymap = gdk_keymap_get_default ();
+      GdkKeymap *keymap = gdk_keymap_get_for_display (gdk_display_get_default ());
       gint       i;
 
       for (i = 0; i < G_N_ELEMENTS (mouse_events); i++)
diff --git a/app/widgets/gimpcontrollerwheel.c b/app/widgets/gimpcontrollerwheel.c
index dec4ccc..e843326 100644
--- a/app/widgets/gimpcontrollerwheel.c
+++ b/app/widgets/gimpcontrollerwheel.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <gegl.h>
-#undef GDK_MULTIHEAD_SAFE /* for gdk_keymap_get_default() */
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"
@@ -190,7 +189,7 @@ gimp_controller_wheel_init (GimpControllerWheel *wheel)
 
   if (! events_initialized)
     {
-      GdkKeymap *keymap = gdk_keymap_get_default ();
+      GdkKeymap *keymap = gdk_keymap_get_for_display (gdk_display_get_default ());
       gint       i;
 
       for (i = 0; i < G_N_ELEMENTS (wheel_events); i++)