AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

gdkevents: Use the correct display to copy event data

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-10-27 22:29:29 -07:00
parent 887b7356c3
commit bbe9ef20da
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gdk/gdkevents.c
View File

@ -461,6 +461,15 @@ gdk_event_peek (void)
return event; return event;
} }
static GdkDisplay *
event_get_display (const GdkEvent *event)
{
if (event->any.window)
return gdk_window_get_display (event->any.window);
else
return gdk_display_get_default ();
}
/** /**
* gdk_event_put: * gdk_event_put:
* @event: a #GdkEvent. * @event: a #GdkEvent.
@ -476,10 +485,7 @@ gdk_event_put (const GdkEvent *event)
g_return_if_fail (event != NULL); g_return_if_fail (event != NULL);
if (event->any.window) display = event_get_display (event);
display = gdk_window_get_display (event->any.window);
else
display = gdk_display_get_default ();
gdk_display_put_event (display, event); gdk_display_put_event (display, event);
} }
@ -713,7 +719,7 @@ gdk_event_copy (const GdkEvent *event)
} }
if (gdk_event_is_allocated (event)) if (gdk_event_is_allocated (event))
_gdk_display_event_data_copy (gdk_display_get_default (), event, new_event); _gdk_display_event_data_copy (event_get_display (event), event, new_event);
return new_event; return new_event;
} }
@ -804,7 +810,7 @@ gdk_event_free (GdkEvent *event)
break; break;
} }
display = gdk_display_get_default (); display = event_get_display (event);
if (display) if (display)
_gdk_display_event_data_free (display, event); _gdk_display_event_data_free (display, event);