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

Drop ::proximity-in-event and ::proximity-out-event

Browse Source 
These are unused in GTK+, and are not very common.
If you need to catch these events, the generic ::event
signal still works.
This commit is contained in:
Matthias Clasen 2018-01-01 17:18:30 -05:00
parent fd2a3b602f
commit e93c2517e6
2 changed files with 2 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gtk/gtkwidget.c
View File

@ -501,8 +501,6 @@ enum {
CONFIGURE_EVENT,
FOCUS_IN_EVENT,
FOCUS_OUT_EVENT,
PROXIMITY_IN_EVENT,
PROXIMITY_OUT_EVENT,
GRAB_BROKEN_EVENT,
DRAG_BEGIN,
DRAG_END,
@ -1019,8 +1017,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
klass->configure_event = NULL;
klass->focus_in_event = gtk_widget_real_focus_in_event;
klass->focus_out_event = gtk_widget_real_focus_out_event;
klass->proximity_in_event = NULL;
klass->proximity_out_event = NULL;
klass->drag_begin = NULL;
klass->drag_end = NULL;
klass->drag_data_delete = NULL;
@ -2264,58 +2260,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
g_signal_set_va_marshaller (widget_signals[FOCUS_OUT_EVENT], G_TYPE_FROM_CLASS (klass),
_gtk_marshal_BOOLEAN__OBJECTv);
/**
* GtkWidget::proximity-in-event:
* @widget: the object which received the signal
* @event: (type Gdk.EventProximity): the #GdkEventProximity which triggered
* this signal.
*
* To receive this signal the #GdkWindow associated to the widget needs
* to enable the #GDK_PROXIMITY_IN_MASK mask.
*
* This signal will be sent to the grab widget if there is one.
*
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
widget_signals[PROXIMITY_IN_EVENT] =
g_signal_new (I_("proximity-in-event"),
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
G_STRUCT_OFFSET (GtkWidgetClass, proximity_in_event),
_gtk_boolean_handled_accumulator, NULL,
_gtk_marshal_BOOLEAN__OBJECT,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT);
g_signal_set_va_marshaller (widget_signals[PROXIMITY_IN_EVENT], G_TYPE_FROM_CLASS (klass),
_gtk_marshal_BOOLEAN__OBJECTv);
/**
* GtkWidget::proximity-out-event:
* @widget: the object which received the signal
* @event: (type Gdk.EventProximity): the #GdkEventProximity which triggered
* this signal.
*
* To receive this signal the #GdkWindow associated to the widget needs
* to enable the #GDK_PROXIMITY_OUT_MASK mask.
*
* This signal will be sent to the grab widget if there is one.
*
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
widget_signals[PROXIMITY_OUT_EVENT] =
g_signal_new (I_("proximity-out-event"),
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
G_STRUCT_OFFSET (GtkWidgetClass, proximity_out_event),
_gtk_boolean_handled_accumulator, NULL,
_gtk_marshal_BOOLEAN__OBJECT,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT);
g_signal_set_va_marshaller (widget_signals[PROXIMITY_OUT_EVENT], G_TYPE_FROM_CLASS (klass),
_gtk_marshal_BOOLEAN__OBJECTv);
/**
* GtkWidget::drag-leave:
* @widget: the object which received the signal.
@ -6436,6 +6380,8 @@ gtk_widget_emit_event_signals (GtkWidget *widget,
case GDK_PAD_RING:
case GDK_PAD_STRIP:
case GDK_PAD_GROUP_MODE:
case GDK_PROXIMITY_IN:
case GDK_PROXIMITY_OUT:
case GDK_EXPOSE:
case GDK_DELETE:
case GDK_DESTROY:
@ -6480,12 +6426,6 @@ gtk_widget_emit_event_signals (GtkWidget *widget,
case GDK_CONFIGURE:
signal_num = CONFIGURE_EVENT;
break;
case GDK_PROXIMITY_IN:
signal_num = PROXIMITY_IN_EVENT;
break;
case GDK_PROXIMITY_OUT:
signal_num = PROXIMITY_OUT_EVENT;
break;
case GDK_GRAB_BROKEN:
signal_num = GRAB_BROKEN_EVENT;
break;

6
gtk/gtkwidget.h
View File

@ -216,8 +216,6 @@ struct _GtkWidget
* widget’s window.
* @focus_out_event: Signal emitted when the keyboard focus leaves the
* widget’s window.
* @proximity_in_event:
* @proximity_out_event:
* @grab_broken_event: Signal emitted when a pointer or keyboard grab
* on a window belonging to widget gets broken.
* @drag_begin: Signal emitted on the drag source when a drag is
@ -346,10 +344,6 @@ struct _GtkWidgetClass
GdkEventFocus *event);
gboolean (* focus_out_event) (GtkWidget *widget,
GdkEventFocus *event);
gboolean (* proximity_in_event) (GtkWidget *widget,
GdkEventProximity *event);
gboolean (* proximity_out_event) (GtkWidget *widget,
GdkEventProximity *event);
gboolean (* grab_broken_event) (GtkWidget *widget,
GdkEventGrabBroken *event);