diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2017-10-11 15:55:19 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2017-12-14 00:58:32 +0100 |
| commit | 64decbfd7415f0e634743949ae6e0a52b46452fe (patch) | |
| tree | 58e8e6d0d323ee865f66def35eaecb44fa1605b8 /gdk/x11 | |
| parent | b9db0b55cb68985185feff891146beef6456c427 (diff) | |
| download | gtk+-64decbfd7415f0e634743949ae6e0a52b46452fe.tar.gz | |
gdk: Remove GdkEventType argument from GdkEvent union
It won't stand true anymore that the GdkEventType argument is the
first field of the GdkEvent* structs. All callers have been updated
to use event->any.type instead.
Diffstat (limited to 'gdk/x11')
| -rw-r--r-- | gdk/x11/gdkdevicemanager-core-x11.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkdnd-x11.c | 4 | ||||
| -rw-r--r-- | gdk/x11/gdkeventsource.c | 14 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c index 8394fd8504..a8b87a835c 100644 --- a/gdk/x11/gdkdevicemanager-core-x11.c +++ b/gdk/x11/gdkdevicemanager-core-x11.c @@ -226,7 +226,7 @@ translate_key_event (GdkDisplay *display, if (GDK_DEBUG_CHECK (EVENTS)) { g_message ("%s:\t\twindow: %ld key: %12s %d", - event->type == GDK_KEY_PRESS ? "key press " : "key release", + event->any.type == GDK_KEY_PRESS ? "key press " : "key release", xevent->xkey.window, event->key.keyval ? gdk_keyval_name (event->key.keyval) : "(none)", event->key.keyval); diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index b7a57bdd34..367eaa6df6 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -3369,10 +3369,10 @@ gdk_x11_drag_context_handle_event (GdkDragContext *context, if (!context->is_source) return FALSE; - if (!x11_context->grab_seat && event->type != GDK_DROP_FINISHED) + if (!x11_context->grab_seat && event->any.type != GDK_DROP_FINISHED) return FALSE; - switch ((guint) event->type) + switch ((guint) event->any.type) { case GDK_MOTION_NOTIFY: return gdk_dnd_handle_motion_event (context, &event->motion); diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c index 5c5ce1bafd..3d2917feae 100644 --- a/gdk/x11/gdkeventsource.c +++ b/gdk/x11/gdkeventsource.c @@ -357,8 +357,8 @@ gdk_event_source_translate_event (GdkX11Display *x11_display, } if (event && - (event->type == GDK_ENTER_NOTIFY || - event->type == GDK_LEAVE_NOTIFY) && + (event->any.type == GDK_ENTER_NOTIFY || + event->any.type == GDK_LEAVE_NOTIFY) && event->any.window != NULL) { /* Handle focusing (in the case where no window manager is running */ @@ -366,11 +366,11 @@ gdk_event_source_translate_event (GdkX11Display *x11_display, } if (event && - (event->type == GDK_TOUCH_BEGIN || - event->type == GDK_TOUCH_END || - event->type == GDK_MOTION_NOTIFY || - event->type == GDK_ENTER_NOTIFY || - event->type == GDK_LEAVE_NOTIFY)) + (event->any.type == GDK_TOUCH_BEGIN || + event->any.type == GDK_TOUCH_END || + event->any.type == GDK_MOTION_NOTIFY || + event->any.type == GDK_ENTER_NOTIFY || + event->any.type == GDK_LEAVE_NOTIFY)) { handle_touch_synthetic_crossing (event); } diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 16521b79fd..a30861827e 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -4863,7 +4863,7 @@ gdk_x11_window_show_window_menu (GdkWindow *window, double x_root, y_root; XClientMessageEvent xclient = { 0 }; - switch ((guint) event->type) + switch ((guint) event->any.type) { case GDK_BUTTON_PRESS: case GDK_BUTTON_RELEASE: |