summaryrefslogtreecommitdiff
path: root/gtk/gtkbox.c
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.van.berkom@gmail.com>2010-04-03 21:35:18 -0400
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2010-04-03 21:35:18 -0400
commitae2c0b02c3a9023553540d4a07e6636a22ce17d6 (patch)
treec77b0075a03b139fd916c8411f12d918b13a7d4f /gtk/gtkbox.c
parent5d83f5eba58a7266949c5e47fb5f3fefec10c107 (diff)
downloadgtk+-ae2c0b02c3a9023553540d4a07e6636a22ce17d6.tar.gz
Refixed merge conflicts for GTK_WIDGET_MAPPED/GTK_WIDGET_VISIBLE
Diffstat (limited to 'gtk/gtkbox.c')
-rw-r--r--gtk/gtkbox.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index a0217f08b7..61f237bc44 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -478,7 +478,7 @@ gtk_box_size_allocate (GtkWidget *widget,
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (child->widget),