From af24aef782056e52eb4d39c2880da648578c2728 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 16 Jul 1998 02:47:15 +0000 Subject: handle negative values similar to gtk_widget_set_uposition(). that is: Thu Jul 16 01:27:15 1998 Tim Janik * gtk/gtkwidget.h: * gtk/gtkwidget.c (gtk_widget_set_usize): handle negative values similar to gtk_widget_set_uposition(). that is: -1=unspecified, -2=leave untouched. changed the width/height field of GtkWidgetAuxInfo to be gint16s rather than guint16s, since that's what the code expected (for a long time actually). * gtk/gtkviewport.c: added support for object arguments: GtkViewport::shadow_type, GtkViewport::vadjustment and GtkViewport::hadjustment. (gtk_viewport_add): chain gtk_bin_add. * gtk/gtkscrolledwindow.c: added support for object argument: GtkScrolledWindow::hscrollbar_policy, GtkScrolledWindow::vscrollbar_policy and GtkScrolledWindow::viewport. * gtk/gtkadjustment.h: * gtk/gtkadjustment.c: * gtk/gtkctree.h: * gtk/gtkclist.h: * gtk/gtkctree.c: * gtk/gtkclist.c: * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c: * gtk/gtkviewport.h: * gtk/gtkviewport.c: GtkType and macro fixups. --- gtk/gtkobject.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gtk/gtkobject.c') diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index dd7742939b..23842dee8b 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -855,9 +855,12 @@ gtk_object_add_arg_type (const char *arg_name, g_return_if_fail (arg_name != NULL); g_return_if_fail (arg_type > GTK_TYPE_NONE); g_return_if_fail (arg_id > 0); - g_return_if_fail ((arg_flags & GTK_ARG_READWRITE) != 0); g_return_if_fail ((arg_flags & GTK_ARG_CHILD_ARG) == 0); - + if (arg_flags & GTK_ARG_CONSTRUCT) + g_return_if_fail ((arg_flags & GTK_ARG_READWRITE) == GTK_ARG_READWRITE); + else + g_return_if_fail ((arg_flags & GTK_ARG_READWRITE) != 0); + if (!object_arg_info_ht) object_arg_info_ht = g_hash_table_new (gtk_arg_info_hash, gtk_arg_info_equal); -- cgit v1.2.1