diff options
author | Tim Janik <timj@gimp.org> | 1998-03-11 04:05:15 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 1998-03-11 04:05:15 +0000 |
commit | 309d7377e7ed7450adebac3ec42f02ebe678b927 (patch) | |
tree | 40c367bfa0981270508a0cb2a02cb8d268864a0c /gtk/gtkcontainer.c | |
parent | 2ff460a6c84c9e64a833bb335d0c843c89166625 (diff) | |
download | gtk+-309d7377e7ed7450adebac3ec42f02ebe678b927.tar.gz |
applied gtk-bolliet-980310-0.patch.gz which adds more checks and
Wed Mar 11 04:35:06 1998 Tim Janik <timj@gimp.org>
* gtk/gtklist.c:
* gtk/gtktree.h:
* gtk/gtktree.c:
* gtk/gtktreeitem.h:
* gtk/gtktreeitem.c: applied gtk-bolliet-980310-0.patch.gz which adds
more checks and implements gtk_tree_clear_items. made a bunch of style
and indentation fixes.
Diffstat (limited to 'gtk/gtkcontainer.c')
-rw-r--r-- | gtk/gtkcontainer.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index d7c6dec86b..d00d17fb00 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -308,6 +308,11 @@ void gtk_container_add (GtkContainer *container, GtkWidget *widget) { + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_CONTAINER (container)); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_WIDGET (widget)); + gtk_signal_emit (GTK_OBJECT (container), container_signals[ADD], widget); } @@ -317,7 +322,10 @@ gtk_container_remove (GtkContainer *container, { g_return_if_fail (container != NULL); g_return_if_fail (GTK_IS_CONTAINER (container)); - + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (GTK_CONTAINER (widget->parent) == container); + if (container->focus_child == widget) container->focus_child = NULL; |