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/gtktoolbar.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/gtktoolbar.c')
| -rw-r--r-- | gtk/gtktoolbar.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index de2dad8016..d23eba5a61 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -138,25 +138,6 @@ gtk_toolbar_class_init (GtkToolbarClass *class) parent_class = gtk_type_class (gtk_container_get_type ()); - toolbar_signals[ORIENTATION_CHANGED] = - gtk_signal_new ("orientation_changed", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkToolbarClass, orientation_changed), - gtk_marshal_VOID__INT, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT); - toolbar_signals[STYLE_CHANGED] = - gtk_signal_new ("style_changed", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkToolbarClass, style_changed), - gtk_marshal_VOID__INT, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT); - - gtk_object_class_add_signals (object_class, toolbar_signals, LAST_SIGNAL); - object_class->destroy = gtk_toolbar_destroy; object_class->set_arg = gtk_toolbar_set_arg; object_class->get_arg = gtk_toolbar_get_arg; @@ -174,6 +155,23 @@ gtk_toolbar_class_init (GtkToolbarClass *class) class->orientation_changed = gtk_real_toolbar_orientation_changed; class->style_changed = gtk_real_toolbar_style_changed; + + toolbar_signals[ORIENTATION_CHANGED] = + gtk_signal_new ("orientation_changed", + GTK_RUN_FIRST, + GTK_CLASS_TYPE (object_class), + GTK_SIGNAL_OFFSET (GtkToolbarClass, orientation_changed), + gtk_marshal_VOID__INT, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT); + toolbar_signals[STYLE_CHANGED] = + gtk_signal_new ("style_changed", + GTK_RUN_FIRST, + GTK_CLASS_TYPE (object_class), + GTK_SIGNAL_OFFSET (GtkToolbarClass, style_changed), + gtk_marshal_VOID__INT, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT); gtk_object_add_arg_type ("GtkToolbar::orientation", GTK_TYPE_ORIENTATION, GTK_ARG_READWRITE, ARG_ORIENTATION); |