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

gdk: Remove GdkDisplay from GdkEventPrivate

Browse Source 
And add it to GdkEventAny.
This commit is contained in:
Carlos Garnacho 2017-10-25 14:06:20 +02:00
parent 8595e4b1d1
commit 1e1f2a6e67
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/gdkevents.c
View File

@ -375,8 +375,6 @@ gdk_event_new (GdkEventType type)
event_hash = g_hash_table_new (g_direct_hash, NULL);
new_private = g_slice_new0 (GdkEventPrivate);
new_private->display = NULL;
g_hash_table_insert (event_hash, new_private, GUINT_TO_POINTER (1));
@ -524,7 +522,6 @@ gdk_event_copy (const GdkEvent *event)
{
GdkEventPrivate *private = (GdkEventPrivate *)event;
new_private->display = private->display;
g_set_object (&new_private->user_data, private->user_data);
}
@ -1761,25 +1758,14 @@ void
gdk_event_set_display (GdkEvent *event,
GdkDisplay *display)
{
GdkEventPrivate *private;
g_return_if_fail (gdk_event_is_allocated (event));
private = (GdkEventPrivate *)event;
private->display = display;
event->any.display = display;
}
GdkDisplay *
gdk_event_get_display (const GdkEvent *event)
{
if (gdk_event_is_allocated (event))
{
GdkEventPrivate *private = (GdkEventPrivate *)event;
if (private->display)
return private->display;
}
if (event->any.display)
return event->any.display;
if (event->any.window)
return gdk_window_get_display (event->any.window);

1
gdk/gdkeventsprivate.h
View File

@ -48,6 +48,7 @@ struct _GdkEventAny
gint8 send_event;
GdkDevice *device;
GdkDevice *source_device;
GdkDisplay *display;
};
/**

1
gdk/gdkinternals.h
View File

@ -146,7 +146,6 @@ typedef enum
struct _GdkEventPrivate
{
GdkEvent event;
GdkDisplay *display;
GObject *user_data;
};