diff options
author | Tim Janik <timj@gtk.org> | 2000-12-13 01:34:41 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 2000-12-13 01:34:41 +0000 |
commit | 2c9eb3a5725420394322ecedb1556d59b5b4bcaa (patch) | |
tree | 20b8260cee065e2f83ff7bb4f15788f28acfa26a /gtk/gtktreeitem.c | |
parent | 90461d7def6e605e410713d954307864285e8776 (diff) | |
download | gtk+-2c9eb3a5725420394322ecedb1556d59b5b4bcaa.tar.gz |
doh, this was broken beyond believe.
Tue Dec 12 23:46:44 2000 Tim Janik <timj@gtk.org>
* gtk/stock-icons/Makefile.am: doh, this was broken beyond believe.
* gtk/gtkbox.c: change property types from (u)long to (u)int for
::position and ::padding.
* gtk/gtkcontainer.c: make ::border_width an INT property.
* gtk/gtkpacker.c: make ::position an INT property.
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed):
guard against NULL h/v scrollbars, since this is used at construction
time.
* gtk/gtkclist.[hc]: nuked gtk_clist_construct(), implemented
internal gtk_clist_constructor().
* gtk/gtkctree.[hc]: nuked gtk_ctree_construct(), implemented
gtk_ctree_constructor().
* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): property
::pulse_step should use ARG_PULSE_STEP, not ARG_FRACTION.
* docs/reference/Makefile.am: fun stuff, disabled docs generation
again, gtk-scan.c needs to introspec paramspecs, not GtkAgs.
* gtk/gtkwidget.[hc]:
removed gtk_widget_setv(), gtk_widget_getv(), gtk_widget_newv()
and gtk_widget_get().
(gtk_widget_new): use g_object_new_valist().
(gtk_widget_set): use g_object_set_valist().
* gtk/gtkobject.[hc]:
removed gtk_object_arg_get_info(), gtk_object_getv(),
gtk_object_query_args(), gtk_object_newv(),
gtk_object_class_add_signals(),
gtk_object_class_user_signal_new(),
gtk_object_class_user_signal_newv(),
gtk_object_arg_set(), gtk_object_arg_get(),
gtk_object_args_collect(),
gtk_object_default_construct(),
gtk_object_constructed(),
GTK_CONSTRUCTED and GTK_OBJECT_CONSTRUCTED().
removed nsignals, signals and n_args members from GtkObjectClass.
(gtk_object_new): use g_object_new_valist().
(gtk_object_set): use g_object_set_valist().
(gtk_object_get): use g_object_get_valist().
* gtk/gtkcompat.h: define gtk_object_default_construct().
* gtk/gtktypeutils.c (gtk_type_new): create constructed objects via
g_object_new().
* gtk/*.c: removed gtk_object_class_add_signals() from class_init()
fucntions, cleaned up method assignments (make sure your structures
are setup properly before calling out). removed all GTK_CONSTRUCTED
hacks ;)
Diffstat (limited to 'gtk/gtktreeitem.c')
-rw-r--r-- | gtk/gtktreeitem.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c index 6f62870e6d..dc4cb886e0 100644 --- a/gtk/gtktreeitem.c +++ b/gtk/gtktreeitem.c @@ -133,30 +133,13 @@ gtk_tree_item_class_init (GtkTreeItemClass *class) GtkContainerClass *container_class; GtkItemClass *item_class; + parent_class = gtk_type_class (GTK_TYPE_ITEM); + object_class = (GtkObjectClass*) class; widget_class = (GtkWidgetClass*) class; item_class = (GtkItemClass*) class; container_class = (GtkContainerClass*) class; - parent_class = gtk_type_class (gtk_item_get_type ()); - - tree_item_signals[EXPAND_TREE] = - gtk_signal_new ("expand", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkTreeItemClass, expand), - gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, 0); - tree_item_signals[COLLAPSE_TREE] = - gtk_signal_new ("collapse", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkTreeItemClass, collapse), - gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, 0); - - gtk_object_class_add_signals (object_class, tree_item_signals, LAST_SIGNAL); - object_class->destroy = gtk_tree_item_destroy; widget_class->realize = gtk_tree_item_realize; @@ -178,6 +161,21 @@ gtk_tree_item_class_init (GtkTreeItemClass *class) class->expand = gtk_real_tree_item_expand; class->collapse = gtk_real_tree_item_collapse; + + tree_item_signals[EXPAND_TREE] = + gtk_signal_new ("expand", + GTK_RUN_FIRST, + GTK_CLASS_TYPE (object_class), + GTK_SIGNAL_OFFSET (GtkTreeItemClass, expand), + gtk_marshal_VOID__VOID, + GTK_TYPE_NONE, 0); + tree_item_signals[COLLAPSE_TREE] = + gtk_signal_new ("collapse", + GTK_RUN_FIRST, + GTK_CLASS_TYPE (object_class), + GTK_SIGNAL_OFFSET (GtkTreeItemClass, collapse), + gtk_marshal_VOID__VOID, + GTK_TYPE_NONE, 0); } /* callback for event box mouse event */ |