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

gtk: Stop using gdk_event_get_screen

Browse Source 
Use gdk_event_get_display instead.
This commit is contained in:
Matthias Clasen 2017-10-30 22:15:57 -04:00
parent 525e2a7944
commit f63d01b782
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkdnd.c
View File

@ -1348,7 +1348,7 @@ gtk_drag_begin_internal (GtkWidget *widget,
info->destroy_icon = FALSE; info->destroy_icon = FALSE;
if (event) if (event)
info->cur_screen = gdk_event_get_screen (event); info->cur_screen = gdk_display_get_default_screen (gdk_event_get_display (event));
else else
gdk_device_get_position (pointer, &info->cur_screen, NULL, NULL); gdk_device_get_position (pointer, &info->cur_screen, NULL, NULL);
@ -2279,7 +2279,7 @@ gtk_drag_motion_cb (GtkWidget *widget,
double x_root, y_root; double x_root, y_root;
gdk_event_get_root_coords ((GdkEvent *)event, &x_root, &y_root); gdk_event_get_root_coords ((GdkEvent *)event, &x_root, &y_root);
screen = gdk_event_get_screen ((GdkEvent *)event); screen = gdk_display_get_default_screen (gdk_event_get_display ((GdkEvent *)event));
gtk_drag_update (info, screen, (int)x_root, (int)y_root, (GdkEvent *) event); gtk_drag_update (info, screen, (int)x_root, (int)y_root, (GdkEvent *) event);

6
gtk/gtkmenu.c
View File

@ -1883,7 +1883,6 @@ get_device_for_event (const GdkEvent *event)
{ {
GdkDevice *device = NULL; GdkDevice *device = NULL;
GdkSeat *seat = NULL; GdkSeat *seat = NULL;
GdkScreen *screen = NULL;
GdkDisplay *display = NULL; GdkDisplay *display = NULL;
device = gdk_event_get_device (event); device = gdk_event_get_device (event);
@ -1895,10 +1894,7 @@ get_device_for_event (const GdkEvent *event)
if (!seat) if (!seat)
{ {
screen = gdk_event_get_screen (event); display = gdk_event_get_display (event);
if (screen)
display = gdk_screen_get_display (screen);
if (!display) if (!display)
{ {