callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use GtkBoxChild in GtkStatusBar

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=624397
This commit is contained in:
Javier Jardón 2010-07-15 00:46:22 +02:00
parent 910ad4872c
commit 82efd2d92f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkstatusbar.c
View File

@ -1031,8 +1031,9 @@ static gboolean
has_extra_children (GtkStatusbar *statusbar) has_extra_children (GtkStatusbar *statusbar)
{ {
GtkStatusbarPriv *priv = statusbar->priv; GtkStatusbarPriv *priv = statusbar->priv;
GtkPackType child_pack_type, frame_pack_type;
GtkWidget *child, *frame;
GList *l, *children; GList *l, *children;
GtkBoxChild *child, *frame;
/* If the internal frame has been modified assume we have extra children */ /* If the internal frame has been modified assume we have extra children */
if (gtk_bin_get_child (GTK_BIN (priv->frame)) != priv->label) if (gtk_bin_get_child (GTK_BIN (priv->frame)) != priv->label)
@ -1044,18 +1045,24 @@ has_extra_children (GtkStatusbar *statusbar)
{ {
frame = l->data; frame = l->data;
if (frame->widget == priv->frame) if (frame == priv->frame)
break; break;
} }
gtk_box_query_child_packing (GTK_BOX (statusbar), frame,
NULL, NULL, NULL, &frame_pack_type);
for (l = l->next; l; l = l->next) for (l = l->next; l; l = l->next)
{ {
child = l->data; child = l->data;
if (!gtk_widget_get_visible (child->widget)) if (!gtk_widget_get_visible (child))
continue; continue;
if (frame->pack == GTK_PACK_START || child->pack == GTK_PACK_END) gtk_box_query_child_packing (GTK_BOX (statusbar), frame,
NULL, NULL, NULL, &child_pack_type);
if (frame_pack_type == GTK_PACK_START || child_pack_type == GTK_PACK_END)
return TRUE; return TRUE;
} }