AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Convert GTK_TYPE_CTREE_NODE to pointer derivation instead of boxed

Browse Source 
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.
This commit is contained in:
Owen Taylor 2001-11-04 19:57:17 +00:00 committed by Owen Taylor
parent d36c54b4a8
commit ee0ebf46ab
10 changed files with 62 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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.
2001-11-04 Tor Lillqvist <tml@iki.fi>
* gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
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.
2001-11-04 Tor Lillqvist <tml@iki.fi>
* gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
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.
2001-11-04 Tor Lillqvist <tml@iki.fi>
* gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
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.
2001-11-04 Tor Lillqvist <tml@iki.fi>
* gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
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.
2001-11-04 Tor Lillqvist <tml@iki.fi>
* gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
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.
2001-11-04 Tor Lillqvist <tml@iki.fi>
* gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
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.
2001-11-04 Tor Lillqvist <tml@iki.fi>
* gtk/gtkimmodule.c: Can't include gtkprivate.h (I added the

43
gtk/gtkctree.c
View File

@ -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;
}

2
gtk/gtkmarshal.list
View File

@ -44,12 +44,10 @@ VOID:BOOLEAN
VOID:BOOLEAN,BOOLEAN,BOOLEAN
VOID:BOXED
VOID:BOXED,BOXED
VOID:BOXED,BOXED,BOXED
VOID:BOXED,BOXED,POINTER
VOID:BOXED,POINTER
VOID:BOXED,OBJECT
VOID:BOXED,STRING,INT
VOID:BOXED,INT
VOID:BOXED,UINT
VOID:BOXED,UINT,FLAGS
VOID:BOXED,UINT,UINT

2
gtk/gtkmarshalers.list
View File

@ -44,12 +44,10 @@ VOID:BOOLEAN
VOID:BOOLEAN,BOOLEAN,BOOLEAN
VOID:BOXED
VOID:BOXED,BOXED
VOID:BOXED,BOXED,BOXED
VOID:BOXED,BOXED,POINTER
VOID:BOXED,POINTER
VOID:BOXED,OBJECT
VOID:BOXED,STRING,INT
VOID:BOXED,INT
VOID:BOXED,UINT
VOID:BOXED,UINT,FLAGS
VOID:BOXED,UINT,UINT