[gthumb] removed use of deprecated function gtk_widget_get_pointer



commit 0f0f59e0a5167cd542d64aa79b0327c4b4bcf822
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri May 4 11:46:11 2012 +0200

    removed use of deprecated function gtk_widget_get_pointer

 gthumb/gth-folder-tree.c |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/gthumb/gth-folder-tree.c b/gthumb/gth-folder-tree.c
index 12f7605..6516b0e 100644
--- a/gthumb/gth-folder-tree.c
+++ b/gthumb/gth-folder-tree.c
@@ -1120,13 +1120,26 @@ gth_folder_tree_set_list (GthFolderTree *folder_tree,
 static void
 emit_fake_motion_notify_event (GthFolderTree *folder_tree)
 {
-	GdkEventMotion event;
-	int            x, y;
+	GtkWidget      *widget = GTK_WIDGET (folder_tree);
+	GdkDevice      *device;
+	GdkWindow      *window;
+	GdkEventMotion  event;
+	int             x, y;
 
-	gtk_widget_get_pointer (GTK_WIDGET (folder_tree), &x, &y);
+	if (! gtk_widget_get_realized (widget))
+		return;
+
+	device = gdk_device_manager_get_client_pointer (
+		   gdk_display_get_device_manager (
+		     gtk_widget_get_display (GTK_WIDGET (folder_tree))));
+	window = gdk_window_get_device_position (gtk_widget_get_window (widget),
+						 device,
+						 &x,
+						 &y,
+						 NULL);
 
 	event.type = GDK_MOTION_NOTIFY;
-	event.window = gtk_tree_view_get_bin_window (GTK_TREE_VIEW (folder_tree));
+	event.window = (window != NULL) ? window : gtk_tree_view_get_bin_window (GTK_TREE_VIEW (folder_tree));
 	event.send_event = TRUE;
 	event.time = GDK_CURRENT_TIME;
 	event.x = x;
@@ -1134,9 +1147,9 @@ emit_fake_motion_notify_event (GthFolderTree *folder_tree)
 	event.axes = NULL;
 	event.state = 0;
 	event.is_hint = FALSE;
-	event.device = NULL;
+	event.device = device;
 
-	GTK_WIDGET_GET_CLASS (folder_tree)->motion_notify_event ((GtkWidget*) folder_tree, &event);
+	GTK_WIDGET_GET_CLASS (folder_tree)->motion_notify_event (widget, &event);
 }
 
 



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