diff options
| author | Tim Janik <timj@gtk.org> | 1998-07-10 03:59:44 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-07-10 03:59:44 +0000 |
| commit | 55b5e035fcb721452d1feaa1b1a1679f71c2b8e9 (patch) | |
| tree | cfff3e2b504d66341b4048f2433b6820f8ef342a /gtk/gtkcontainer.c | |
| parent | 002d37e6e303aa57bd7c577f4e448e2e38eefa03 (diff) | |
| download | gdk-pixbuf-55b5e035fcb721452d1feaa1b1a1679f71c2b8e9.tar.gz | |
collect the arguments with gtk_container_child_args_collect, not through
Fri Jul 10 05:51:44 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:
(gtk_container_add_with_args): collect the arguments with
gtk_container_child_args_collect, not through gtk_object_args_collect.
(gtk_container_child_set): likewise.
(cut 'n paste strikes back)
Diffstat (limited to 'gtk/gtkcontainer.c')
| -rw-r--r-- | gtk/gtkcontainer.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 240d1b743..c5a236d6c 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -300,10 +300,10 @@ gtk_container_add_with_args (GtkContainer *container, gchar *error; va_start (var_args, widget); - error = gtk_object_args_collect (GTK_OBJECT_TYPE (container), - &arg_list, - &info_list, - &var_args); + error = gtk_container_child_args_collect (GTK_OBJECT_TYPE (container), + &arg_list, + &info_list, + &var_args); va_end (var_args); if (error) @@ -418,10 +418,10 @@ gtk_container_child_set (GtkContainer *container, g_return_if_fail (child->parent != NULL); va_start (var_args, child); - error = gtk_object_args_collect (GTK_OBJECT_TYPE (container), - &arg_list, - &info_list, - &var_args); + error = gtk_container_child_args_collect (GTK_OBJECT_TYPE (container), + &arg_list, + &info_list, + &var_args); va_end (var_args); if (error) @@ -475,6 +475,7 @@ gtk_container_arg_set (GtkContainer *container, return; } } + g_return_if_fail (info->arg_flags & GTK_ARG_CHILD_ARG); if (! (info->arg_flags & GTK_ARG_WRITABLE)) { @@ -525,6 +526,7 @@ gtk_container_arg_get (GtkContainer *container, return; } } + g_return_if_fail (info->arg_flags & GTK_ARG_CHILD_ARG); if (! (info->arg_flags & GTK_ARG_READABLE)) { |