summaryrefslogtreecommitdiff
path: root/gtk/gtkbox.c
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2002-01-30 22:29:03 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2002-01-30 22:29:03 +0000
commit4dddfb2dc62a68196f0f3e52712a25c427275b37 (patch)
tree63c2d56da9bbafaf5d90b9a87d22ef483a7ad40f /gtk/gtkbox.c
parent95ab2a72b4ba0a84b9c430d941f778367e02584b (diff)
downloadgtk+-4dddfb2dc62a68196f0f3e52712a25c427275b37.tar.gz
Remove excess calls to g_return_if_fail from static and virtual functions.
Diffstat (limited to 'gtk/gtkbox.c')
-rw-r--r--gtk/gtkbox.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 4c50b1137f..82e8aed048 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -356,7 +356,7 @@ gtk_box_pack_start (GtkBox *box,
GtkBoxChild *child_info;
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (child->parent == NULL);
child_info = g_new (GtkBoxChild, 1);
@@ -391,7 +391,7 @@ gtk_box_pack_end (GtkBox *box,
GtkBoxChild *child_info;
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (child->parent == NULL);
child_info = g_new (GtkBoxChild, 1);
@@ -420,9 +420,6 @@ void
gtk_box_pack_start_defaults (GtkBox *box,
GtkWidget *child)
{
- g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
-
gtk_box_pack_start (box, child, TRUE, TRUE, 0);
}
@@ -430,9 +427,6 @@ void
gtk_box_pack_end_defaults (GtkBox *box,
GtkWidget *child)
{
- g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
-
gtk_box_pack_end (box, child, TRUE, TRUE, 0);
}
@@ -505,7 +499,7 @@ gtk_box_reorder_child (GtkBox *box,
GList *list;
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
list = box->children;
while (list)
@@ -572,7 +566,7 @@ gtk_box_query_child_packing (GtkBox *box,
GtkBoxChild *child_info = NULL;
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
list = box->children;
while (list)
@@ -609,7 +603,7 @@ gtk_box_set_child_packing (GtkBox *box,
GtkBoxChild *child_info = NULL;
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
list = box->children;
while (list)
@@ -646,9 +640,6 @@ static void
gtk_box_add (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_BOX (container));
- g_return_if_fail (widget != NULL);
-
gtk_box_pack_start_defaults (GTK_BOX (container), widget);
}
@@ -660,9 +651,6 @@ gtk_box_remove (GtkContainer *container,
GtkBoxChild *child;
GList *children;
- g_return_if_fail (GTK_IS_BOX (container));
- g_return_if_fail (widget != NULL);
-
box = GTK_BOX (container);
children = box->children;
@@ -704,7 +692,6 @@ gtk_box_forall (GtkContainer *container,
GtkBoxChild *child;
GList *children;
- g_return_if_fail (GTK_IS_BOX (container));
g_return_if_fail (callback != NULL);
box = GTK_BOX (container);