summaryrefslogtreecommitdiff
path: root/gtk/gtkscrolledwindow.c
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-11-23 04:32:04 +0000
committerTim Janik <timj@src.gnome.org>1998-11-23 04:32:04 +0000
commitb9017e53a240e8b89b9d0a643f49d6521a4a3283 (patch)
treeea1e9380cdcc6af52c60206ac54e5a1f7c189f4d /gtk/gtkscrolledwindow.c
parent72149265a32d0979a140c4b245ecf4946b989976 (diff)
downloadgtk+-b9017e53a240e8b89b9d0a643f49d6521a4a3283.tar.gz
removed assertements for constructed containers again, since this
Mon Nov 23 05:21:50 1998 Tim Janik <timj@gtk.org> * gtk/gtkcontainer.c: (gtk_container_add_with_args): (gtk_container_addv): (gtk_container_add): removed assertements for constructed containers again, since this essentially breaks the "child" arg. * gtk/gtktooltips.c (gtk_tooltips_force_window): fixup the draw_window reference count, we don't need to reference toplevels that already have destroy notifiers. * gtk/gtkscrolledwindow.c: check for the composites existance in _forall since we might not be already constructed.
Diffstat (limited to 'gtk/gtkscrolledwindow.c')
-rw-r--r--gtk/gtkscrolledwindow.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index d68960b924..944026fc2b 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -547,8 +547,10 @@ gtk_scrolled_window_forall (GtkContainer *container,
callback (scrolled_window->child, callback_data);
if (include_internals)
{
- callback (scrolled_window->vscrollbar, callback_data);
- callback (scrolled_window->hscrollbar, callback_data);
+ if (scrolled_window->vscrollbar)
+ callback (scrolled_window->vscrollbar, callback_data);
+ if (scrolled_window->hscrollbar)
+ callback (scrolled_window->hscrollbar, callback_data);
}
}