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

Drop ::configure-event

Browse Source 
This signal is unused in GTK+ and configure events are handled
internally by GtkWindow.

If you need to catch configure events, the generic ::event
signal still works.
This commit is contained in:
Matthias Clasen 2018-01-01 18:25:35 -05:00
parent 59572e5fcf
commit a9d468a4c8
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkwidget.c
View File

@ -497,7 +497,6 @@ enum {
KEY_RELEASE_EVENT, KEY_RELEASE_EVENT,
ENTER_NOTIFY_EVENT, ENTER_NOTIFY_EVENT,
LEAVE_NOTIFY_EVENT, LEAVE_NOTIFY_EVENT,
CONFIGURE_EVENT,
FOCUS_IN_EVENT, FOCUS_IN_EVENT,
FOCUS_OUT_EVENT, FOCUS_OUT_EVENT,
GRAB_BROKEN_EVENT, GRAB_BROKEN_EVENT,
@ -1009,7 +1008,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
klass->key_release_event = gtk_widget_real_key_release_event; klass->key_release_event = gtk_widget_real_key_release_event;
klass->enter_notify_event = NULL; klass->enter_notify_event = NULL;
klass->leave_notify_event = NULL; klass->leave_notify_event = NULL;
klass->configure_event = NULL;
klass->focus_in_event = gtk_widget_real_focus_in_event; klass->focus_in_event = gtk_widget_real_focus_in_event;
klass->focus_out_event = gtk_widget_real_focus_out_event; klass->focus_out_event = gtk_widget_real_focus_out_event;
klass->drag_begin = NULL; klass->drag_begin = NULL;
@ -2131,34 +2129,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
g_signal_set_va_marshaller (widget_signals[LEAVE_NOTIFY_EVENT], G_TYPE_FROM_CLASS (klass), g_signal_set_va_marshaller (widget_signals[LEAVE_NOTIFY_EVENT], G_TYPE_FROM_CLASS (klass),
_gtk_marshal_BOOLEAN__OBJECTv); _gtk_marshal_BOOLEAN__OBJECTv);
/**
* GtkWidget::configure-event:
* @widget: the object which received the signal
* @event: (type Gdk.EventConfigure): the #GdkEventConfigure which triggered
* this signal.
*
* The ::configure-event signal will be emitted when the size, position or
* stacking of the @widget's window has changed.
*
* To receive this signal, the #GdkWindow associated to the widget needs
* to enable the #GDK_STRUCTURE_MASK mask. GDK will enable this mask
* automatically for all new windows.
*
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
widget_signals[CONFIGURE_EVENT] =
g_signal_new (I_("configure-event"),
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkWidgetClass, configure_event),
_gtk_boolean_handled_accumulator, NULL,
_gtk_marshal_BOOLEAN__OBJECT,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT);
g_signal_set_va_marshaller (widget_signals[CONFIGURE_EVENT], G_TYPE_FROM_CLASS (klass),
_gtk_marshal_BOOLEAN__OBJECTv);
/** /**
* GtkWidget::focus-in-event: * GtkWidget::focus-in-event:
* @widget: the object which received the signal * @widget: the object which received the signal
@ -6338,6 +6308,7 @@ gtk_widget_emit_event_signals (GtkWidget *widget,
case GDK_DESTROY: case GDK_DESTROY:
case GDK_MAP: case GDK_MAP:
case GDK_UNMAP: case GDK_UNMAP:
case GDK_CONFIGURE:
case GDK_NOTHING: case GDK_NOTHING:
signal_num = -1; signal_num = -1;
break; break;
@ -6365,9 +6336,6 @@ gtk_widget_emit_event_signals (GtkWidget *widget,
case GDK_FOCUS_CHANGE: case GDK_FOCUS_CHANGE:
signal_num = event->focus_change.in ? FOCUS_IN_EVENT : FOCUS_OUT_EVENT; signal_num = event->focus_change.in ? FOCUS_IN_EVENT : FOCUS_OUT_EVENT;
break; break;
case GDK_CONFIGURE:
signal_num = CONFIGURE_EVENT;
break;
case GDK_GRAB_BROKEN: case GDK_GRAB_BROKEN:
signal_num = GRAB_BROKEN_EVENT; signal_num = GRAB_BROKEN_EVENT;
break; break;

4
gtk/gtkwidget.h
View File

@ -208,8 +208,6 @@ struct _GtkWidget
* enters the widget’s window. * enters the widget’s window.
* @leave_notify_event: Will be emitted when the pointer leaves the * @leave_notify_event: Will be emitted when the pointer leaves the
* widget’s window. * widget’s window.
* @configure_event: Signal will be emitted when the size, position or
* stacking of the widget’s window has changed.
* @focus_in_event: Signal emitted when the keyboard focus enters the * @focus_in_event: Signal emitted when the keyboard focus enters the
* widget’s window. * widget’s window.
* @focus_out_event: Signal emitted when the keyboard focus leaves the * @focus_out_event: Signal emitted when the keyboard focus leaves the
@ -334,8 +332,6 @@ struct _GtkWidgetClass
GdkEventCrossing *event); GdkEventCrossing *event);
gboolean (* leave_notify_event) (GtkWidget *widget, gboolean (* leave_notify_event) (GtkWidget *widget,
GdkEventCrossing *event); GdkEventCrossing *event);
gboolean (* configure_event) (GtkWidget *widget,
GdkEventConfigure *event);
gboolean (* focus_in_event) (GtkWidget *widget, gboolean (* focus_in_event) (GtkWidget *widget,
GdkEventFocus *event); GdkEventFocus *event);
gboolean (* focus_out_event) (GtkWidget *widget, gboolean (* focus_out_event) (GtkWidget *widget,