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/wayland | |
| 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/wayland')
| -rw-r--r-- | gdk/wayland/gdkdevice-wayland.c | 16 | ||||
| -rw-r--r-- | gdk/wayland/gdkwindow-wayland.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index 66c89efd3c..f6fd4634f0 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -1344,7 +1344,7 @@ gdk_wayland_seat_get_frame_event (GdkWaylandSeat *seat, GdkEventType evtype) { if (seat->pointer_info.frame.event && - seat->pointer_info.frame.event->type != evtype) + seat->pointer_info.frame.event->any.type != evtype) gdk_wayland_seat_flush_frame_event (seat); seat->pointer_info.frame.event = gdk_event_new (evtype); @@ -2461,7 +2461,7 @@ emit_gesture_swipe_event (GdkWaylandSeat *seat, GDK_NOTE (EVENTS, g_message ("swipe event %d, coords: %f %f, seat %p state %d", - event->type, event->touchpad_swipe.x, + event->any.type, event->touchpad_swipe.x, event->touchpad_swipe.y, seat, event->touchpad_swipe.state)); @@ -2565,7 +2565,7 @@ emit_gesture_pinch_event (GdkWaylandSeat *seat, GDK_NOTE (EVENTS, g_message ("pinch event %d, coords: %f %f, seat %p state %d", - event->type, event->touchpad_pinch.x, + event->any.type, event->touchpad_pinch.x, event->touchpad_pinch.y, seat, event->touchpad_pinch.state)); @@ -3244,7 +3244,7 @@ gdk_wayland_tablet_flush_frame_event (GdkWaylandTabletData *tablet, if (!event) return; - switch ((guint) event->type) + switch ((guint) event->any.type) { case GDK_MOTION_NOTIFY: event->motion.time = time; @@ -3272,7 +3272,7 @@ gdk_wayland_tablet_flush_frame_event (GdkWaylandTabletData *tablet, return; } - if (event->type == GDK_PROXIMITY_OUT) + if (event->any.type == GDK_PROXIMITY_OUT) emulate_crossing (event->any.window, NULL, tablet->master, GDK_LEAVE_NOTIFY, GDK_CROSSING_NORMAL, time); @@ -3280,7 +3280,7 @@ gdk_wayland_tablet_flush_frame_event (GdkWaylandTabletData *tablet, _gdk_wayland_display_deliver_event (gdk_seat_get_display (tablet->seat), event); - if (event->type == GDK_PROXIMITY_IN) + if (event->any.type == GDK_PROXIMITY_IN) emulate_crossing (event->any.window, NULL, tablet->master, GDK_ENTER_NOTIFY, GDK_CROSSING_NORMAL, time); @@ -3291,7 +3291,7 @@ gdk_wayland_tablet_get_frame_event (GdkWaylandTabletData *tablet, GdkEventType evtype) { if (tablet->pointer_info.frame.event && - tablet->pointer_info.frame.event->type != evtype) + tablet->pointer_info.frame.event->any.type != evtype) gdk_wayland_tablet_flush_frame_event (tablet, GDK_CURRENT_TIME); tablet->pointer_info.frame.event = gdk_event_new (evtype); @@ -3726,7 +3726,7 @@ tablet_tool_handle_frame (void *data, frame_event = tablet->pointer_info.frame.event; - if (frame_event && frame_event->type == GDK_PROXIMITY_OUT) + if (frame_event && frame_event->any.type == GDK_PROXIMITY_OUT) { tool->current_tablet = NULL; tablet->current_tool = NULL; diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index d7fa1861e0..d6281cd339 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -3602,7 +3602,7 @@ gdk_wayland_window_show_window_menu (GdkWindow *window, double x, y; uint32_t serial; - switch ((guint) event->type) + switch ((guint) event->any.type) { case GDK_BUTTON_PRESS: case GDK_BUTTON_RELEASE: |