[gtk+/multitouch: 23/23] gdk: Do not use deprecated API



commit d70abd3f90799d420edaa140b1aa72ab61b4de48
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Oct 26 19:36:06 2011 +0200

    gdk: Do not use deprecated API
    
    Crossing events emulation should use the device
    given so the coordinates are correct for any
    device ID.

 gdk/gdkdisplay.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index bf50c84..2dc1dde 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -782,8 +782,9 @@ synthesize_crossing_events (GdkDisplay      *display,
       src_toplevel == dest_toplevel)
     {
       /* Same toplevels */
-      gdk_window_get_pointer (dest_toplevel,
-			      &x, &y, &state);
+      gdk_window_get_device_position (dest_toplevel,
+                                      device,
+                                      &x, &y, &state);
       _gdk_synthesize_crossing_events (display,
 				       src_window,
 				       dest_window,
@@ -796,8 +797,9 @@ synthesize_crossing_events (GdkDisplay      *display,
     }
   else if (dest_toplevel == NULL)
     {
-      gdk_window_get_pointer (src_toplevel,
-			      &x, &y, &state);
+      gdk_window_get_device_position (src_toplevel,
+                                      device,
+                                      &x, &y, &state);
       _gdk_synthesize_crossing_events (display,
                                        src_window,
                                        NULL,
@@ -811,8 +813,9 @@ synthesize_crossing_events (GdkDisplay      *display,
   else
     {
       /* Different toplevels */
-      gdk_window_get_pointer (src_toplevel,
-			      &x, &y, &state);
+      gdk_window_get_device_position (src_toplevel,
+                                      device,
+                                      &x, &y, &state);
       _gdk_synthesize_crossing_events (display,
 				       src_window,
 				       NULL,
@@ -822,8 +825,9 @@ synthesize_crossing_events (GdkDisplay      *display,
 				       time,
 				       NULL,
 				       serial, FALSE);
-      gdk_window_get_pointer (dest_toplevel,
-			      &x, &y, &state);
+      gdk_window_get_device_position (dest_toplevel,
+                                      device,
+                                      &x, &y, &state);
       _gdk_synthesize_crossing_events (display,
 				       NULL,
 				       dest_window,



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