diff options
author | Christian Hergert <chergert@redhat.com> | 2019-06-06 15:27:54 -0700 |
---|---|---|
committer | Christian Hergert <chergert@redhat.com> | 2019-06-06 15:30:42 -0700 |
commit | 828c36636cfe975ed2771b72d6fdffa8f0e691eb (patch) | |
tree | 1b1043ff39ecf524251d129368ba04f4376964e8 /gtk | |
parent | c168116e6405f2de8974d5180549982ee7ee31a3 (diff) | |
download | gtk+-828c36636cfe975ed2771b72d6fdffa8f0e691eb.tar.gz |
va_marshaller: add various va_marshallers
We don't need to cover every case with a va_marshaller, but there are a
number of them that are useful because they will often only be connected
to by a single signal handler.
Generally speaking, if I opened into a file to add a va_marshaller, I just
set all of them.
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtkcellrenderer.c | 3 | ||||
-rw-r--r-- | gtk/gtkcellrenderercombo.c | 3 | ||||
-rw-r--r-- | gtk/gtkcellrenderertext.c | 3 | ||||
-rw-r--r-- | gtk/gtkeditable.c | 75 | ||||
-rw-r--r-- | gtk/gtkeventcontrollerscroll.c | 10 | ||||
-rw-r--r-- | gtk/gtkflowbox.c | 3 | ||||
-rw-r--r-- | gtk/gtkiconview.c | 6 | ||||
-rw-r--r-- | gtk/gtkimcontext.c | 8 | ||||
-rw-r--r-- | gtk/gtklistbox.c | 3 | ||||
-rw-r--r-- | gtk/gtkmarshalers.list | 1 | ||||
-rw-r--r-- | gtk/gtknotebook.c | 29 | ||||
-rw-r--r-- | gtk/gtkoverlay.c | 3 | ||||
-rw-r--r-- | gtk/gtkswitch.c | 3 | ||||
-rw-r--r-- | gtk/gtktexttagtable.c | 3 | ||||
-rw-r--r-- | gtk/gtktextview.c | 9 | ||||
-rw-r--r-- | gtk/gtktreemodel.c | 12 | ||||
-rw-r--r-- | gtk/gtktreeview.c | 39 | ||||
-rw-r--r-- | gtk/gtkwidget.c | 30 |
18 files changed, 210 insertions, 33 deletions
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 72780c77c9..f4010925c6 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -282,6 +282,9 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) G_TYPE_NONE, 2, GTK_TYPE_CELL_EDITABLE, G_TYPE_STRING); + g_signal_set_va_marshaller (cell_renderer_signals[EDITING_STARTED], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_VOID__OBJECT_STRINGv); g_object_class_install_property (object_class, PROP_MODE, diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c index 21e6a729d2..1e333a68d1 100644 --- a/gtk/gtkcellrenderercombo.c +++ b/gtk/gtkcellrenderercombo.c @@ -207,6 +207,9 @@ gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass) G_TYPE_NONE, 2, G_TYPE_STRING, GTK_TYPE_TREE_ITER); + g_signal_set_va_marshaller (cell_renderer_combo_signals[CHANGED], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_VOID__STRING_BOXEDv); } static void diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 91370a19da..18a81940fc 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -638,6 +638,9 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); + g_signal_set_va_marshaller (text_cell_renderer_signals [EDITED], + G_OBJECT_CLASS_TYPE (object_class), + _gtk_marshal_VOID__STRING_STRINGv); gtk_cell_renderer_class_set_accessible_type (cell_class, GTK_TYPE_TEXT_CELL_ACCESSIBLE); } diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index 9569c4bc20..c61b365012 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -156,7 +156,15 @@ G_DEFINE_INTERFACE (GtkEditable, gtk_editable, GTK_TYPE_WIDGET) +enum { + CHANGED, + DELETE_TEXT, + INSERT_TEXT, + N_SIGNALS +}; + static GQuark quark_editable_data; +static guint signals[N_SIGNALS]; static GtkEditable * get_delegate (GtkEditable *editable) @@ -175,7 +183,7 @@ gtk_editable_default_do_insert_text (GtkEditable *editable, int length, int *position) { - g_signal_emit_by_name (editable, "insert-text", text, length, position); + g_signal_emit (editable, signals[INSERT_TEXT], 0, text, length, position); } #define warn_no_delegate(func) \ @@ -200,7 +208,7 @@ gtk_editable_default_do_delete_text (GtkEditable *editable, int start_pos, int end_pos) { - g_signal_emit_by_name (editable, "delete-text", start_pos, end_pos); + g_signal_emit (editable, signals[DELETE_TEXT], 0, start_pos, end_pos); } static void @@ -289,16 +297,20 @@ gtk_editable_default_init (GtkEditableInterface *iface) * is possible to modify the inserted text, or prevent * it from being inserted entirely. */ - g_signal_new (I_("insert-text"), - GTK_TYPE_EDITABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkEditableInterface, insert_text), - NULL, NULL, - _gtk_marshal_VOID__STRING_INT_POINTER, - G_TYPE_NONE, 3, - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_POINTER); + signals[INSERT_TEXT] = + g_signal_new (I_("insert-text"), + GTK_TYPE_EDITABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkEditableInterface, insert_text), + NULL, NULL, + _gtk_marshal_VOID__STRING_INT_POINTER, + G_TYPE_NONE, 3, + G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_POINTER); + g_signal_set_va_marshaller (signals[INSERT_TEXT], + G_TYPE_FROM_INTERFACE (iface), + _gtk_marshal_VOID__STRING_INT_POINTERv); /** * GtkEditable::delete-text: @@ -316,15 +328,19 @@ gtk_editable_default_init (GtkEditableInterface *iface) * and @end_pos parameters are interpreted as for * gtk_editable_delete_text(). */ - g_signal_new (I_("delete-text"), - GTK_TYPE_EDITABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkEditableInterface, delete_text), - NULL, NULL, - _gtk_marshal_VOID__INT_INT, - G_TYPE_NONE, 2, - G_TYPE_INT, - G_TYPE_INT); + signals[DELETE_TEXT] = + g_signal_new (I_("delete-text"), + GTK_TYPE_EDITABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkEditableInterface, delete_text), + NULL, NULL, + _gtk_marshal_VOID__INT_INT, + G_TYPE_NONE, 2, + G_TYPE_INT, + G_TYPE_INT); + g_signal_set_va_marshaller (signals[DELETE_TEXT], + G_TYPE_FROM_INTERFACE (iface), + _gtk_marshal_VOID__INT_INTv); /** * GtkEditable::changed: @@ -339,13 +355,14 @@ gtk_editable_default_init (GtkEditableInterface *iface) * the new content, and may cause multiple ::notify::text signals * to be emitted). */ - g_signal_new (I_("changed"), - GTK_TYPE_EDITABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkEditableInterface, changed), - NULL, NULL, - NULL, - G_TYPE_NONE, 0); + signals[CHANGED] = + g_signal_new (I_("changed"), + GTK_TYPE_EDITABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkEditableInterface, changed), + NULL, NULL, + NULL, + G_TYPE_NONE, 0); g_object_interface_install_property (iface, g_param_spec_string ("text", @@ -860,7 +877,7 @@ static void delegate_changed (GtkEditable *delegate, gpointer editable) { - g_signal_emit_by_name (editable, "changed"); + g_signal_emit (editable, signals[CHANGED], 0); } static void diff --git a/gtk/gtkeventcontrollerscroll.c b/gtk/gtkeventcontrollerscroll.c index 01cd5374a3..06b8d38efb 100644 --- a/gtk/gtkeventcontrollerscroll.c +++ b/gtk/gtkeventcontrollerscroll.c @@ -403,8 +403,11 @@ gtk_event_controller_scroll_class_init (GtkEventControllerScrollClass *klass) GTK_TYPE_EVENT_CONTROLLER_SCROLL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _gtk_marshal_BOOLEAN__DOUBLE_DOUBLE, + _gtk_marshal_BOOLEAN__DOUBLE_DOUBLE, G_TYPE_BOOLEAN, 2, G_TYPE_DOUBLE, G_TYPE_DOUBLE); + g_signal_set_va_marshaller (signals[SCROLL], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__DOUBLE_DOUBLEv); /** * GtkEventControllerScroll::scroll-end: * @controller: The object that received the signal @@ -436,8 +439,11 @@ gtk_event_controller_scroll_class_init (GtkEventControllerScrollClass *klass) GTK_TYPE_EVENT_CONTROLLER_SCROLL, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - _gtk_marshal_VOID__DOUBLE_DOUBLE, + _gtk_marshal_VOID__DOUBLE_DOUBLE, G_TYPE_NONE, 2, G_TYPE_DOUBLE, G_TYPE_DOUBLE); + g_signal_set_va_marshaller (signals[DECELERATE], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__DOUBLE_DOUBLEv); g_object_class_install_properties (object_class, N_PROPS, pspecs); } diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c index 53a417df82..05a549a31d 100644 --- a/gtk/gtkflowbox.c +++ b/gtk/gtkflowbox.c @@ -3621,6 +3621,9 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class) _gtk_marshal_BOOLEAN__ENUM_INT, G_TYPE_BOOLEAN, 2, GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT); + g_signal_set_va_marshaller (signals[MOVE_CURSOR], + G_TYPE_FROM_CLASS (class), + _gtk_marshal_BOOLEAN__ENUM_INTv); /** * GtkFlowBox::select-all: * @box: the #GtkFlowBox on which the signal is emitted diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index aa33469028..3e0150ab76 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -782,6 +782,9 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) NULL, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (icon_view_signals[ACTIVATE_CURSOR_ITEM], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__VOIDv); /** * GtkIconView::move-cursor: @@ -814,6 +817,9 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) G_TYPE_BOOLEAN, 2, GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT); + g_signal_set_va_marshaller (icon_view_signals[MOVE_CURSOR], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__ENUM_INTv); /* Key bindings */ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK, diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 1cffd09d41..c01b5b98de 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -302,6 +302,9 @@ gtk_im_context_class_init (GtkIMContextClass *klass) _gtk_boolean_handled_accumulator, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (im_context_signals[RETRIEVE_SURROUNDING], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__VOIDv); /** * GtkIMContext::delete-surrounding: * @context: the object on which the signal is emitted @@ -324,7 +327,10 @@ gtk_im_context_class_init (GtkIMContextClass *klass) _gtk_marshal_BOOLEAN__INT_INT, G_TYPE_BOOLEAN, 2, G_TYPE_INT, - G_TYPE_INT); + G_TYPE_INT); + g_signal_set_va_marshaller (im_context_signals[DELETE_SURROUNDING], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__INT_INTv); properties[PROP_INPUT_PURPOSE] = g_param_spec_enum ("input-purpose", diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c index ca788a9176..44743bfdae 100644 --- a/gtk/gtklistbox.c +++ b/gtk/gtklistbox.c @@ -603,6 +603,9 @@ gtk_list_box_class_init (GtkListBoxClass *klass) _gtk_marshal_VOID__ENUM_INT, G_TYPE_NONE, 2, GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT); + g_signal_set_va_marshaller (signals[MOVE_CURSOR], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__ENUM_INTv); widget_class->activate_signal = signals[ACTIVATE_CURSOR_ROW]; diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index aa5b662996..16c5c1caf2 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -53,6 +53,7 @@ ENUM:ENUM ENUM:VOID INT:POINTER INT:DOUBLE,DOUBLE +OBJECT:OBJECT OBJECT:VOID STRING:DOUBLE STRING:STRING diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index a426dc931f..e86e457923 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -1088,6 +1088,9 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_TYPE_NONE, 2, GTK_TYPE_WIDGET, G_TYPE_UINT); + g_signal_set_va_marshaller (notebook_signals[SWITCH_PAGE], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_VOID__OBJECT_UINTv); notebook_signals[FOCUS_TAB] = g_signal_new (I_("focus-tab"), G_TYPE_FROM_CLASS (gobject_class), @@ -1097,6 +1100,9 @@ gtk_notebook_class_init (GtkNotebookClass *class) _gtk_marshal_BOOLEAN__ENUM, G_TYPE_BOOLEAN, 1, GTK_TYPE_NOTEBOOK_TAB); + g_signal_set_va_marshaller (notebook_signals[FOCUS_TAB], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__ENUMv); notebook_signals[SELECT_PAGE] = g_signal_new (I_("select-page"), G_TYPE_FROM_CLASS (gobject_class), @@ -1106,6 +1112,9 @@ gtk_notebook_class_init (GtkNotebookClass *class) _gtk_marshal_BOOLEAN__BOOLEAN, G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (notebook_signals[SELECT_PAGE], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__BOOLEANv); notebook_signals[CHANGE_CURRENT_PAGE] = g_signal_new (I_("change-current-page"), G_TYPE_FROM_CLASS (gobject_class), @@ -1115,6 +1124,9 @@ gtk_notebook_class_init (GtkNotebookClass *class) _gtk_marshal_BOOLEAN__INT, G_TYPE_BOOLEAN, 1, G_TYPE_INT); + g_signal_set_va_marshaller (notebook_signals[CHANGE_CURRENT_PAGE], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__INTv); notebook_signals[MOVE_FOCUS_OUT] = g_signal_new (I_("move-focus-out"), G_TYPE_FROM_CLASS (gobject_class), @@ -1134,6 +1146,9 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_TYPE_BOOLEAN, 2, GTK_TYPE_DIRECTION_TYPE, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (notebook_signals[REORDER_TAB], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__ENUM_BOOLEANv); /** * GtkNotebook::page-reordered: * @notebook: the #GtkNotebook @@ -1153,6 +1168,9 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_TYPE_NONE, 2, GTK_TYPE_WIDGET, G_TYPE_UINT); + g_signal_set_va_marshaller (notebook_signals[PAGE_REORDERED], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_VOID__OBJECT_UINTv); /** * GtkNotebook::page-removed: * @notebook: the #GtkNotebook @@ -1172,6 +1190,9 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_TYPE_NONE, 2, GTK_TYPE_WIDGET, G_TYPE_UINT); + g_signal_set_va_marshaller (notebook_signals[PAGE_REMOVED], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_VOID__OBJECT_UINTv); /** * GtkNotebook::page-added: * @notebook: the #GtkNotebook @@ -1191,6 +1212,9 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_TYPE_NONE, 2, GTK_TYPE_WIDGET, G_TYPE_UINT); + g_signal_set_va_marshaller (notebook_signals[PAGE_ADDED], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_VOID__OBJECT_UINTv); /** * GtkNotebook::create-window: @@ -1215,9 +1239,12 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkNotebookClass, create_window), gtk_object_handled_accumulator, NULL, - NULL, + _gtk_marshal_OBJECT__OBJECT, GTK_TYPE_NOTEBOOK, 1, GTK_TYPE_WIDGET); + g_signal_set_va_marshaller (notebook_signals[CREATE_WINDOW], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_OBJECT__OBJECTv); binding_set = gtk_binding_set_by_class (class); gtk_binding_entry_add_signal (binding_set, diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c index 6ce6ad3f67..7001aa59ba 100644 --- a/gtk/gtkoverlay.c +++ b/gtk/gtkoverlay.c @@ -316,6 +316,9 @@ gtk_overlay_class_init (GtkOverlayClass *klass) G_TYPE_BOOLEAN, 2, GTK_TYPE_WIDGET, GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE); + g_signal_set_va_marshaller (signals[GET_CHILD_POSITION], + G_TYPE_FROM_CLASS (object_class), + _gtk_marshal_BOOLEAN__OBJECT_BOXEDv); gtk_widget_class_set_css_name (widget_class, I_("overlay")); diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c index 1d3dce8106..9ff8efb43f 100644 --- a/gtk/gtkswitch.c +++ b/gtk/gtkswitch.c @@ -620,6 +620,9 @@ gtk_switch_class_init (GtkSwitchClass *klass) _gtk_marshal_BOOLEAN__BOOLEAN, G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (signals[STATE_SET], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__BOOLEANv); g_object_class_override_property (gobject_class, PROP_ACTION_NAME, "action-name"); g_object_class_override_property (gobject_class, PROP_ACTION_TARGET, "action-target"); diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c index ac40a05517..0b2e6623c7 100644 --- a/gtk/gtktexttagtable.c +++ b/gtk/gtktexttagtable.c @@ -136,6 +136,9 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) 2, GTK_TYPE_TEXT_TAG, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (signals[TAG_CHANGED], + G_OBJECT_CLASS_TYPE (object_class), + _gtk_marshal_VOID__OBJECT_BOOLEANv); /** * GtkTextTagTable::tag-added: diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 5dc3766037..865b300049 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -1036,6 +1036,9 @@ gtk_text_view_class_init (GtkTextViewClass *klass) GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (signals[MOVE_CURSOR], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__ENUM_INT_BOOLEANv); /** * GtkTextView::move-viewport: @@ -1061,6 +1064,9 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_NONE, 2, GTK_TYPE_SCROLL_STEP, G_TYPE_INT); + g_signal_set_va_marshaller (signals[MOVE_VIEWPORT], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__ENUM_INTv); /** * GtkTextView::set-anchor: @@ -1134,6 +1140,9 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, G_TYPE_INT); + g_signal_set_va_marshaller (signals[DELETE_FROM_CURSOR], + G_OBJECT_CLASS_TYPE (gobject_class), + _gtk_marshal_VOID__ENUM_INTv); /** * GtkTextView::backspace: diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 7c00a880b1..1ddd31584c 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -365,6 +365,9 @@ gtk_tree_model_base_init (gpointer g_class) G_TYPE_NONE, 2, GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE, GTK_TYPE_TREE_ITER); + g_signal_set_va_marshaller (tree_model_signals[ROW_CHANGED], + G_TYPE_FROM_CLASS (g_class), + _gtk_marshal_VOID__BOXED_BOXEDv); /* We need to get notification about structure changes * to update row references., so instead of using the @@ -403,6 +406,9 @@ gtk_tree_model_base_init (gpointer g_class) _gtk_marshal_VOID__BOXED_BOXED, G_TYPE_NONE, 2, row_inserted_params); + g_signal_set_va_marshaller (tree_model_signals[ROW_INSERTED], + G_TYPE_FROM_CLASS (g_class), + _gtk_marshal_VOID__BOXED_BOXEDv); /** * GtkTreeModel::row-has-child-toggled: @@ -423,6 +429,9 @@ gtk_tree_model_base_init (gpointer g_class) G_TYPE_NONE, 2, GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE, GTK_TYPE_TREE_ITER); + g_signal_set_va_marshaller (tree_model_signals[ROW_HAS_CHILD_TOGGLED], + G_TYPE_FROM_CLASS (g_class), + _gtk_marshal_VOID__BOXED_BOXEDv); /** * GtkTreeModel::row-deleted: @@ -479,6 +488,9 @@ gtk_tree_model_base_init (gpointer g_class) _gtk_marshal_VOID__BOXED_BOXED_POINTER, G_TYPE_NONE, 3, rows_reordered_params); + g_signal_set_va_marshaller (tree_model_signals[ROWS_REORDERED], + G_TYPE_FROM_CLASS (g_class), + _gtk_marshal_VOID__BOXED_BOXED_POINTERv); initialized = TRUE; } } diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index a942cef29b..e16ae22a8a 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1258,6 +1258,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_NONE, 2, GTK_TYPE_TREE_PATH, GTK_TYPE_TREE_VIEW_COLUMN); + g_signal_set_va_marshaller (tree_view_signals[ROW_ACTIVATED], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_VOID__BOXED_OBJECTv); /** * GtkTreeView::test-expand-row: @@ -1280,6 +1283,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN, 2, GTK_TYPE_TREE_ITER, GTK_TYPE_TREE_PATH); + g_signal_set_va_marshaller (tree_view_signals[TEST_EXPAND_ROW], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__BOXED_BOXEDv); /** * GtkTreeView::test-collapse-row: @@ -1302,6 +1308,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN, 2, GTK_TYPE_TREE_ITER, GTK_TYPE_TREE_PATH); + g_signal_set_va_marshaller (tree_view_signals[TEST_COLLAPSE_ROW], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__BOXED_BOXEDv); /** * GtkTreeView::row-expanded: @@ -1321,6 +1330,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_NONE, 2, GTK_TYPE_TREE_ITER, GTK_TYPE_TREE_PATH); + g_signal_set_va_marshaller (tree_view_signals[ROW_EXPANDED], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_VOID__BOXED_BOXEDv); /** * GtkTreeView::row-collapsed: @@ -1340,6 +1352,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_NONE, 2, GTK_TYPE_TREE_ITER, GTK_TYPE_TREE_PATH); + g_signal_set_va_marshaller (tree_view_signals[ROW_COLLAPSED], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_VOID__BOXED_BOXEDv); /** * GtkTreeView::columns-changed: @@ -1406,6 +1421,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN, 2, GTK_TYPE_MOVEMENT_STEP, G_TYPE_INT); + g_signal_set_va_marshaller (tree_view_signals[MOVE_CURSOR], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__ENUM_INTv); tree_view_signals[SELECT_ALL] = g_signal_new (I_("select-all"), @@ -1415,6 +1433,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) NULL, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (tree_view_signals[SELECT_ALL], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__VOIDv); tree_view_signals[UNSELECT_ALL] = g_signal_new (I_("unselect-all"), @@ -1424,6 +1445,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) NULL, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (tree_view_signals[UNSELECT_ALL], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__VOIDv); tree_view_signals[SELECT_CURSOR_ROW] = g_signal_new (I_("select-cursor-row"), @@ -1434,6 +1458,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) _gtk_marshal_BOOLEAN__BOOLEAN, G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (tree_view_signals[SELECT_CURSOR_ROW], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__BOOLEANv); tree_view_signals[TOGGLE_CURSOR_ROW] = g_signal_new (I_("toggle-cursor-row"), @@ -1443,6 +1470,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) NULL, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (tree_view_signals[TOGGLE_CURSOR_ROW], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__VOIDv); tree_view_signals[EXPAND_COLLAPSE_CURSOR_ROW] = g_signal_new (I_("expand-collapse-cursor-row"), @@ -1455,6 +1485,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (tree_view_signals[EXPAND_COLLAPSE_CURSOR_ROW], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__BOOLEAN_BOOLEAN_BOOLEANv); tree_view_signals[SELECT_CURSOR_PARENT] = g_signal_new (I_("select-cursor-parent"), @@ -1464,6 +1497,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) NULL, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (tree_view_signals[SELECT_CURSOR_PARENT], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__VOIDv); tree_view_signals[START_INTERACTIVE_SEARCH] = g_signal_new (I_("start-interactive-search"), @@ -1473,6 +1509,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) NULL, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (tree_view_signals[START_INTERACTIVE_SEARCH], + G_TYPE_FROM_CLASS (o_class), + _gtk_marshal_BOOLEAN__VOIDv); /* Key bindings */ gtk_tree_view_add_move_binding (binding_set, GDK_KEY_Up, 0, TRUE, diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index fd8f5bf17f..9bc74e9d68 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -1605,6 +1605,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_BOOLEAN__BOOLEAN, G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); + g_signal_set_va_marshaller (widget_signals[MNEMONIC_ACTIVATE], + G_TYPE_FROM_CLASS (gobject_class), + _gtk_marshal_BOOLEAN__BOOLEANv); /** * GtkWidget::move-focus: @@ -1643,6 +1646,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_BOOLEAN__ENUM, G_TYPE_BOOLEAN, 1, GTK_TYPE_DIRECTION_TYPE); + g_signal_set_va_marshaller (widget_signals[KEYNAV_FAILED], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__ENUMv); /** * GtkWidget::drag-leave: @@ -1756,6 +1762,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 2, GDK_TYPE_DRAG, GTK_TYPE_DRAG_RESULT); + g_signal_set_va_marshaller (widget_signals[DRAG_FAILED], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__OBJECT_ENUMv); /** * GtkWidget::drag-motion: @@ -1857,6 +1866,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) GDK_TYPE_DROP, G_TYPE_INT, G_TYPE_INT); + g_signal_set_va_marshaller (widget_signals[DRAG_MOTION], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__OBJECT_INT_INTv); /** * GtkWidget::drag-drop: @@ -1889,6 +1901,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) GDK_TYPE_DROP, G_TYPE_INT, G_TYPE_INT); + g_signal_set_va_marshaller (widget_signals[DRAG_DROP], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__OBJECT_INT_INTv); /** * GtkWidget::drag-data-get: @@ -1914,6 +1929,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 2, GDK_TYPE_DRAG, GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE); + g_signal_set_va_marshaller (widget_signals[DRAG_DATA_GET], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__OBJECT_BOXEDv); /** * GtkWidget::drag-data-received: @@ -1990,6 +2008,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 2, GDK_TYPE_DROP, GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE); + g_signal_set_va_marshaller (widget_signals[DRAG_DATA_RECEIVED], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__OBJECT_BOXEDv); /** * GtkWidget::query-tooltip: @@ -2028,6 +2049,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_INT, G_TYPE_BOOLEAN, GTK_TYPE_TOOLTIP); + g_signal_set_va_marshaller (widget_signals[QUERY_TOOLTIP], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__INT_INT_BOOLEAN_OBJECTv); /** * GtkWidget::popup-menu: @@ -2051,6 +2075,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); + g_signal_set_va_marshaller (widget_signals[POPUP_MENU], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__VOIDv); /** * GtkWidget::accel-closures-changed: @@ -2089,6 +2116,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, _gtk_marshal_BOOLEAN__UINT, G_TYPE_BOOLEAN, 1, G_TYPE_UINT); + g_signal_set_va_marshaller (widget_signals[CAN_ACTIVATE_ACCEL], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_BOOLEAN__UINTv); binding_set = gtk_binding_set_by_class (klass); gtk_binding_entry_add_signal (binding_set, GDK_KEY_F10, GDK_SHIFT_MASK, |