From 163b6853323780042a5486bc0ebb46945a4ab9a0 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: May 15 2012 14:46:37 +0000 Subject: Avoid use of deprecated GTK3 pointer APIs The gtk_widget_get_pointer() API is deprecated in GTK3 since it is not aware of multiple pointers. Replace its usage in autoDrawer.c with GdkDeviceManager and friends Signed-off-by: Daniel P. Berrange --- diff --git a/src/view/autoDrawer.c b/src/view/autoDrawer.c index b0c5028..deb8111 100644 --- a/src/view/autoDrawer.c +++ b/src/view/autoDrawer.c @@ -215,11 +215,22 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN /* Is the mouse cursor inside the event box? */ - { + if (gtk_widget_get_window(priv->evBox)) { int x; int y; +#if GTK_CHECK_VERSION(3, 0, 0) + GdkDevice *dev; + GdkDeviceManager *devmgr; + + devmgr = gdk_display_get_device_manager(gtk_widget_get_display(priv->evBox)); + dev = gdk_device_manager_get_client_pointer(devmgr); + gdk_window_get_device_position(gtk_widget_get_window(priv->evBox), + dev, &x, &y, NULL); +#else gtk_widget_get_pointer(priv->evBox, &x, &y); +#endif + gtk_widget_get_allocation(priv->evBox, &allocation); g_assert(gtk_container_get_border_width( GTK_CONTAINER(priv->evBox)) == 0);