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

Drop GDK_NOTHING

Browse Source 
Events of type GDK_NOTHING are good for nothing.
This commit is contained in:
Matthias Clasen 2020-02-16 00:39:11 -05:00
parent 3830e13b98
commit cd2b58574d
5 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/gdkevents.c
View File

@ -80,12 +80,6 @@ check_event_sanity (GdkEvent *event)
surface = gdk_event_get_surface (event); surface = gdk_event_get_surface (event);
device = gdk_event_get_device (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)) if (surface && display != gdk_surface_get_display (surface))
{ {
char *type = g_enum_to_string (GDK_TYPE_EVENT_TYPE, event->any.type); 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; return event->pad_group_mode.time;
case GDK_CONFIGURE: case GDK_CONFIGURE:
case GDK_FOCUS_CHANGE: case GDK_FOCUS_CHANGE:
case GDK_NOTHING:
case GDK_DELETE: case GDK_DELETE:
case GDK_GRAB_BROKEN: case GDK_GRAB_BROKEN:
case GDK_EVENT_LAST: case GDK_EVENT_LAST:
@ -624,7 +617,6 @@ gdk_event_get_state (const GdkEvent *event,
case GDK_DRAG_LEAVE: case GDK_DRAG_LEAVE:
case GDK_DRAG_MOTION: case GDK_DRAG_MOTION:
case GDK_DROP_START: case GDK_DROP_START:
case GDK_NOTHING:
case GDK_DELETE: case GDK_DELETE:
case GDK_GRAB_BROKEN: case GDK_GRAB_BROKEN:
case GDK_PAD_BUTTON_PRESS: case GDK_PAD_BUTTON_PRESS:
@ -1542,7 +1534,7 @@ G_DEFINE_BOXED_TYPE (GdkEventSequence, gdk_event_sequence,
GdkEventType GdkEventType
gdk_event_get_event_type (const GdkEvent *event) 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; return event->any.type;
} }

2
gdk/gdkevents.h
View File

@ -124,7 +124,6 @@ typedef union _GdkEvent GdkEvent;
/** /**
* GdkEventType: * GdkEventType:
* @GDK_NOTHING: a special code to indicate a null event.
* @GDK_DELETE: the window manager has requested that the toplevel surface be * @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 * hidden or destroyed, usually when the user clicks on a special icon in the
* title bar. * title bar.
@ -181,7 +180,6 @@ typedef union _GdkEvent GdkEvent;
*/ */
typedef enum typedef enum
{ {
GDK_NOTHING,
GDK_DELETE, GDK_DELETE,
GDK_MOTION_NOTIFY, GDK_MOTION_NOTIFY,
GDK_BUTTON_PRESS, GDK_BUTTON_PRESS,

1
gdk/gdksurface.c
View File

@ -4097,7 +4097,6 @@ add_event_mark (GdkEvent *event,
case GDK_FOCUS_CHANGE: case GDK_FOCUS_CHANGE:
case GDK_PROXIMITY_IN: case GDK_PROXIMITY_IN:
case GDK_PROXIMITY_OUT: case GDK_PROXIMITY_OUT:
case GDK_NOTHING:
case GDK_EVENT_LAST: case GDK_EVENT_LAST:
default: default:
break; break;

1
gdk/win32/gdkevents-win32.c
View File

@ -763,7 +763,6 @@ _gdk_win32_print_event (const GdkEvent *event)
switch (event->any.type) switch (event->any.type)
{ {
#define CASE(x) case x: g_print (#x); break; #define CASE(x) case x: g_print (#x); break;
CASE (GDK_NOTHING);
CASE (GDK_DELETE); CASE (GDK_DELETE);
CASE (GDK_DESTROY); CASE (GDK_DESTROY);
CASE (GDK_MOTION_NOTIFY); CASE (GDK_MOTION_NOTIFY);

3
gtk/gtkmain.c
View File

@ -1837,9 +1837,6 @@ gtk_main_do_event (GdkEvent *event)
*/ */
switch ((guint)event->any.type) switch ((guint)event->any.type)
{ {
case GDK_NOTHING:
break;
case GDK_DELETE: case GDK_DELETE:
g_object_ref (target_widget); g_object_ref (target_widget);
if (!gtk_window_group_get_current_grab (window_group) || if (!gtk_window_group_get_current_grab (window_group) ||