diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-02-16 00:39:11 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-02-21 00:47:53 -0500 |
commit | cd2b58574d492e0d597510531e7a1898741d094d (patch) | |
tree | f13585e1b4736060afaa1f3299139333751afa71 /gdk | |
parent | 3830e13b9828ba6720bc8c99092ed1d10a580c58 (diff) | |
download | gtk+-cd2b58574d492e0d597510531e7a1898741d094d.tar.gz |
Drop GDK_NOTHING
Events of type GDK_NOTHING are good for nothing.
Diffstat (limited to 'gdk')
-rw-r--r-- | gdk/gdkevents.c | 10 | ||||
-rw-r--r-- | gdk/gdkevents.h | 2 | ||||
-rw-r--r-- | gdk/gdksurface.c | 1 | ||||
-rw-r--r-- | gdk/win32/gdkevents-win32.c | 1 |
4 files changed, 1 insertions, 13 deletions
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 6547b054b3..b5cd263714 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -80,12 +80,6 @@ check_event_sanity (GdkEvent *event) surface = gdk_event_get_surface (event); device = gdk_event_get_device (event); - if (gdk_event_get_event_type (event) == GDK_NOTHING) - { - g_warning ("Ignoring GDK_NOTHING events; they're good for nothing"); - return FALSE; - } - if (surface && display != gdk_surface_get_display (surface)) { char *type = g_enum_to_string (GDK_TYPE_EVENT_TYPE, event->any.type); @@ -552,7 +546,6 @@ gdk_event_get_time (const GdkEvent *event) return event->pad_group_mode.time; case GDK_CONFIGURE: case GDK_FOCUS_CHANGE: - case GDK_NOTHING: case GDK_DELETE: case GDK_GRAB_BROKEN: case GDK_EVENT_LAST: @@ -624,7 +617,6 @@ gdk_event_get_state (const GdkEvent *event, case GDK_DRAG_LEAVE: case GDK_DRAG_MOTION: case GDK_DROP_START: - case GDK_NOTHING: case GDK_DELETE: case GDK_GRAB_BROKEN: case GDK_PAD_BUTTON_PRESS: @@ -1542,7 +1534,7 @@ G_DEFINE_BOXED_TYPE (GdkEventSequence, gdk_event_sequence, GdkEventType gdk_event_get_event_type (const GdkEvent *event) { - g_return_val_if_fail (event != NULL, GDK_NOTHING); + g_return_val_if_fail (event != NULL, 0); return event->any.type; } diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h index 4a9724487e..03d7aa28b9 100644 --- a/gdk/gdkevents.h +++ b/gdk/gdkevents.h @@ -124,7 +124,6 @@ typedef union _GdkEvent GdkEvent; /** * GdkEventType: - * @GDK_NOTHING: a special code to indicate a null event. * @GDK_DELETE: the window manager has requested that the toplevel surface be * hidden or destroyed, usually when the user clicks on a special icon in the * title bar. @@ -181,7 +180,6 @@ typedef union _GdkEvent GdkEvent; */ typedef enum { - GDK_NOTHING, GDK_DELETE, GDK_MOTION_NOTIFY, GDK_BUTTON_PRESS, diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index f69a9523fb..cd7280e7a3 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -4097,7 +4097,6 @@ add_event_mark (GdkEvent *event, case GDK_FOCUS_CHANGE: case GDK_PROXIMITY_IN: case GDK_PROXIMITY_OUT: - case GDK_NOTHING: case GDK_EVENT_LAST: default: break; diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index af8755be71..c14efa9bd3 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -763,7 +763,6 @@ _gdk_win32_print_event (const GdkEvent *event) switch (event->any.type) { #define CASE(x) case x: g_print (#x); break; - CASE (GDK_NOTHING); CASE (GDK_DELETE); CASE (GDK_DESTROY); CASE (GDK_MOTION_NOTIFY); |