From: Carlos Garnacho Date: Wed, 25 Oct 2017 11:40:28 +0000 (+0200) Subject: gtk: Adapt marshallers to GdkEvent as GObject X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~234 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c8c9f59fca40fa6c91925f1585f2a8b1ef98dfc;p=gtk4.git gtk: Adapt marshallers to GdkEvent as GObject --- diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 2d3f754bb7..2a04b26130 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -1744,10 +1744,10 @@ gtk_entry_class_init (GtkEntryClass *class) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _gtk_marshal_VOID__ENUM_BOXED, + _gtk_marshal_VOID__ENUM_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ENTRY_ICON_POSITION, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); /** * GtkEntry::icon-release: @@ -1766,10 +1766,10 @@ gtk_entry_class_init (GtkEntryClass *class) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _gtk_marshal_VOID__ENUM_BOXED, + _gtk_marshal_VOID__ENUM_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ENTRY_ICON_POSITION, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); /** * GtkEntry::preedit-changed: diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index f95e06325d..61e750e425 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -32,7 +32,7 @@ BOOLEAN:OBJECT,UINT,FLAGS BOOLEAN:OBJECT,INT,INT,UINT BOOLEAN:OBJECT,STRING,STRING,BOXED BOOLEAN:OBJECT,BOXED -BOOLEAN:OBJECT,BOXED,BOXED +BOOLEAN:OBJECT,OBJECT,BOXED BOOLEAN:OBJECT,OBJECT,OBJECT BOOLEAN:OBJECT,STRING,STRING BOOLEAN:OBJECT,ENUM @@ -66,7 +66,7 @@ VOID:ENUM,FLOAT,BOOLEAN VOID:ENUM,INT VOID:ENUM,INT,BOOLEAN VOID:ENUM,INT,INT -VOID:ENUM,BOXED +VOID:ENUM,OBJECT VOID:ENUM,STRING VOID:INT,BOOLEAN VOID:INT,INT diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 314e31db25..15fa27a1dc 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -1941,11 +1941,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::event-after: @@ -1965,7 +1965,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) NULL, NULL, NULL, G_TYPE_NONE, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); /** * GtkWidget::button-press-event: @@ -1990,11 +1990,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, button_press_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[BUTTON_PRESS_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::button-release-event: @@ -2019,11 +2019,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, button_release_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[BUTTON_RELEASE_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); widget_signals[TOUCH_EVENT] = g_signal_new (I_("touch-event"), @@ -2031,11 +2031,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, touch_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[TOUCH_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::scroll-event: @@ -2061,11 +2061,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, scroll_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[SCROLL_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::motion-notify-event: @@ -2090,11 +2090,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, motion_notify_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[MOTION_NOTIFY_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::delete-event: @@ -2116,11 +2116,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, delete_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[DELETE_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::destroy-event: @@ -2145,11 +2145,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, destroy_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[DESTROY_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::key-press-event: @@ -2173,11 +2173,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, key_press_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[KEY_PRESS_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::key-release-event: @@ -2200,11 +2200,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, key_release_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[KEY_RELEASE_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::enter-notify-event: @@ -2229,11 +2229,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, enter_notify_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[ENTER_NOTIFY_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::leave-notify-event: @@ -2258,11 +2258,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, leave_notify_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[LEAVE_NOTIFY_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::configure-event: @@ -2286,11 +2286,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, configure_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[CONFIGURE_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::focus-in-event: @@ -2313,11 +2313,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, focus_in_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[FOCUS_IN_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::focus-out-event: @@ -2340,11 +2340,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, focus_out_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[FOCUS_OUT_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::map-event: @@ -2367,11 +2367,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, map_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[MAP_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::unmap-event: @@ -2394,11 +2394,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, unmap_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[UNMAP_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::property-notify-event: @@ -2421,11 +2421,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, property_notify_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[PROPERTY_NOTIFY_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::selection-received: @@ -2482,11 +2482,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, proximity_in_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[PROXIMITY_IN_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::proximity-out-event: @@ -2508,11 +2508,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED, G_STRUCT_OFFSET (GtkWidgetClass, proximity_out_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[PROXIMITY_OUT_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::drag-leave: @@ -2905,11 +2905,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, window_state_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[WINDOW_STATE_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::grab-broken-event: @@ -2934,11 +2934,11 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, grab_broken_event), _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); + GDK_TYPE_EVENT); g_signal_set_va_marshaller (widget_signals[GRAB_BROKEN_EVENT], G_TYPE_FROM_CLASS (klass), - _gtk_marshal_BOOLEAN__BOXEDv); + _gtk_marshal_BOOLEAN__OBJECTv); /** * GtkWidget::query-tooltip: