[gimp/gtk3-port: 56/236] app: use GdkDeviceManager API



commit 176f029dba043ee977bf0bdbae37a291dabcea1d
Author: Michael Natterer <mitch gimp org>
Date:   Tue Oct 19 17:19:52 2010 +0200

    app: use GdkDeviceManager API

 app/display/gimpdisplayshell-tool-events.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index 2593e19..d085acb 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -475,9 +475,13 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
                  (gimp_tool_control_get_motion_mode (active_tool->control) !=
                   GIMP_MOTION_MODE_EXACT)))
               {
-                GdkDisplay        *gdk_display = gtk_widget_get_display (canvas);
+                GdkDisplay        *gdk_display;
+                GdkDeviceManager  *gdk_manager;
                 GimpDeviceManager *manager;
 
+                gdk_display = gtk_widget_get_display (canvas);
+                gdk_manager = gdk_display_get_device_manager (gdk_display);
+
                 manager = gimp_devices_get_manager (gimp);
 
                 /*  don't request motion hins for XInput devices because
@@ -485,7 +489,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
                  *  (#6901) --mitch
                  */
                 if (gimp_device_manager_get_current_device (manager)->device ==
-                    gdk_display_get_core_pointer (gdk_display))
+                    gdk_device_manager_get_client_pointer (gdk_manager))
                   {
                     event_mask |= GDK_POINTER_MOTION_HINT_MASK;
                   }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]