diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-04 19:57:17 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-04 19:57:17 +0000 |
| commit | ee0ebf46ab061c7213a988a82ecae5b226c3a930 (patch) | |
| tree | cde6e98db10ce472728eb5a535540f9cdc8970fb /gtk/gtkctree.c | |
| parent | d36c54b4a8fc21f8196b06a9eef0570bbf2bf6fe (diff) | |
| download | gdk-pixbuf-ee0ebf46ab061c7213a988a82ecae5b226c3a930.tar.gz | |
Convert GTK_TYPE_CTREE_NODE to pointer derivation instead of boxed
Sat Nov 3 13:57:21 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer
derivation instead of boxed derivation.
* gtk/gtkmarshal.list: Remove some now unused marshallers.
Diffstat (limited to 'gtk/gtkctree.c')
| -rw-r--r-- | gtk/gtkctree.c | 43 |
1 files changed, 13 insertions, 30 deletions
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 2ca063185..a52175d5f 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -432,45 +432,45 @@ gtk_ctree_class_init (GtkCTreeClass *klass) GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row), - gtk_marshal_VOID__BOXED_INT, + gtk_marshal_VOID__POINTER_INT, GTK_TYPE_NONE, 2, - GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE, + GTK_TYPE_CTREE_NODE, GTK_TYPE_INT); ctree_signals[TREE_UNSELECT_ROW] = gtk_signal_new ("tree_unselect_row", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row), - gtk_marshal_VOID__BOXED_INT, + gtk_marshal_VOID__POINTER_INT, GTK_TYPE_NONE, 2, - GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE, + GTK_TYPE_CTREE_NODE, GTK_TYPE_INT); ctree_signals[TREE_EXPAND] = gtk_signal_new ("tree_expand", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand), - gtk_marshal_VOID__BOXED, + gtk_marshal_VOID__POINTER, GTK_TYPE_NONE, 1, - GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE); + GTK_TYPE_CTREE_NODE); ctree_signals[TREE_COLLAPSE] = gtk_signal_new ("tree_collapse", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse), - gtk_marshal_VOID__BOXED, + gtk_marshal_VOID__POINTER, GTK_TYPE_NONE, 1, - GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE); + GTK_TYPE_CTREE_NODE); ctree_signals[TREE_MOVE] = gtk_signal_new ("tree_move", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move), - gtk_marshal_VOID__BOXED_BOXED_BOXED, + gtk_marshal_VOID__POINTER_POINTER_POINTER, GTK_TYPE_NONE, 3, - GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE, - GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE, - GTK_TYPE_CTREE_NODE | G_SIGNAL_TYPE_STATIC_SCOPE); + GTK_TYPE_CTREE_NODE, + GTK_TYPE_CTREE_NODE, + GTK_TYPE_CTREE_NODE); ctree_signals[CHANGE_FOCUS_ROW_EXPANSION] = gtk_signal_new ("change_focus_row_expansion", GTK_RUN_LAST | GTK_RUN_ACTION, @@ -6126,30 +6126,13 @@ gtk_ctree_drag_data_received (GtkWidget *widget, } } -/* dummy boxed type definition, used so that the GtkCTreeNode signal - * arguments have a reasonable type. - */ -static gpointer -ctree_node_copy (gpointer boxed) -{ - return boxed; -} - -static void -ctree_node_free (gpointer boxed) -{ - /* nothing */ -} - GType gtk_ctree_node_get_type (void) { static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("GtkCTreeNode", - (GBoxedCopyFunc)ctree_node_copy, - (GBoxedFreeFunc)ctree_node_free); + our_type = g_pointer_type_register_static ("GtkCTreeNode"); return our_type; } |