AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkWidget: Add some ignore deprecation statements

Browse Source 
We still need access to floating devices here.
This commit is contained in:
Carlos Garnacho 2015-12-16 19:24:51 +01:00
parent 04d7bd49d0
commit 0f98f225d1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkwidget.c
View File

@ -12586,7 +12586,9 @@ list_devices (GtkWidget *widget,
GdkDeviceType device_type,
GList **result)
{
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
GList *devices = gdk_device_manager_list_devices (device_manager, device_type);
G_GNUC_END_IGNORE_DEPRECATIONS;
GList *l;
for (l = devices; l; l = l->next)
@ -12620,11 +12622,14 @@ _gtk_widget_list_devices (GtkWidget *widget)
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
display = gtk_widget_get_display (widget);
device_manager = gdk_display_get_device_manager (display);
if (!_gtk_widget_get_mapped (widget))
return NULL;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
display = gtk_widget_get_display (widget);
device_manager = gdk_display_get_device_manager (display);
G_GNUC_END_IGNORE_DEPRECATIONS;
list_devices (widget, device_manager, GDK_DEVICE_TYPE_MASTER, &result);
/* Rare, but we can get events for grabbed slave devices */
list_devices (widget, device_manager, GDK_DEVICE_TYPE_SLAVE, &result);