From 2c9eb3a5725420394322ecedb1556d59b5b4bcaa Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Wed, 13 Dec 2000 01:34:41 +0000 Subject: doh, this was broken beyond believe. Tue Dec 12 23:46:44 2000 Tim Janik * 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 ;) --- gtk/gtkbox.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gtk/gtkbox.c') diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 32ab748c14..96fad211c0 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -117,9 +117,9 @@ gtk_box_class_init (GtkBoxClass *class) gtk_object_add_arg_type ("GtkBox::homogeneous", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_HOMOGENEOUS); gtk_container_add_child_arg_type ("GtkBox::expand", GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_EXPAND); gtk_container_add_child_arg_type ("GtkBox::fill", GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_FILL); - gtk_container_add_child_arg_type ("GtkBox::padding", GTK_TYPE_ULONG, GTK_ARG_READWRITE, CHILD_ARG_PADDING); + gtk_container_add_child_arg_type ("GtkBox::padding", GTK_TYPE_UINT, GTK_ARG_READWRITE, CHILD_ARG_PADDING); gtk_container_add_child_arg_type ("GtkBox::pack_type", GTK_TYPE_PACK_TYPE, GTK_ARG_READWRITE, CHILD_ARG_PACK_TYPE); - gtk_container_add_child_arg_type ("GtkBox::position", GTK_TYPE_LONG, GTK_ARG_READWRITE, CHILD_ARG_POSITION); + gtk_container_add_child_arg_type ("GtkBox::position", GTK_TYPE_INT, GTK_ARG_READWRITE, CHILD_ARG_POSITION); object_class->set_arg = gtk_box_set_arg; object_class->get_arg = gtk_box_get_arg; @@ -239,7 +239,7 @@ gtk_box_set_child_arg (GtkContainer *container, child, expand, fill, - GTK_VALUE_ULONG (*arg), + GTK_VALUE_UINT (*arg), pack_type); break; case CHILD_ARG_PACK_TYPE: @@ -253,7 +253,7 @@ gtk_box_set_child_arg (GtkContainer *container, case CHILD_ARG_POSITION: gtk_box_reorder_child (GTK_BOX (container), child, - GTK_VALUE_LONG (*arg)); + GTK_VALUE_INT (*arg)); break; default: break; @@ -289,13 +289,13 @@ gtk_box_get_child_arg (GtkContainer *container, GTK_VALUE_BOOL (*arg) = fill; break; case CHILD_ARG_PADDING: - GTK_VALUE_ULONG (*arg) = padding; + GTK_VALUE_UINT (*arg) = padding; break; case CHILD_ARG_PACK_TYPE: GTK_VALUE_ENUM (*arg) = pack_type; break; case CHILD_ARG_POSITION: - GTK_VALUE_LONG (*arg) = 0; + GTK_VALUE_INT (*arg) = 0; for (list = GTK_BOX (container)->children; list; list = list->next) { GtkBoxChild *child_entry; @@ -303,10 +303,10 @@ gtk_box_get_child_arg (GtkContainer *container, child_entry = list->data; if (child_entry->widget == child) break; - GTK_VALUE_LONG (*arg)++; + GTK_VALUE_INT (*arg)++; } if (!list) - GTK_VALUE_LONG (*arg) = -1; + GTK_VALUE_INT (*arg) = -1; break; default: arg->type = GTK_TYPE_INVALID; -- cgit v1.2.1