AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

collect the arguments with gtk_container_child_args_collect, not through

Browse Source 
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)
This commit is contained in:
Tim Janik 1998-07-10 03:59:44 +00:00 committed by Tim Janik
parent 002d37e6e3
commit 55b5e035fc
8 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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.
Fri Jul 10 04:20:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.h:

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
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.
Fri Jul 10 04:20:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.h:

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
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.
Fri Jul 10 04:20:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.h:

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
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.
Fri Jul 10 04:20:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.h:

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
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.
Fri Jul 10 04:20:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.h:

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
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.
Fri Jul 10 04:20:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.h:

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
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.
Fri Jul 10 04:20:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.h:

18
gtk/gtkcontainer.c
View File

@ -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))
{