summaryrefslogtreecommitdiff
path: root/gtk/gtktoolbutton.c
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2017-04-21 18:59:59 +0200
committerTimm Bäder <mail@baedert.org>2017-04-25 20:30:37 +0200
commit5729ea7744c2a41ae8fb833db6690a6aa5ad7a84 (patch)
treeddda46f8b6c07a999ee9b844ec3a9c863b55a850 /gtk/gtktoolbutton.c
parent8f4c0bea6558dc98a2abd7e63436b1ce4caf689e (diff)
downloadgtk+-5729ea7744c2a41ae8fb833db6690a6aa5ad7a84.tar.gz
box: Remove expand child property
GtkWidget already has hexpand/vexpand properties.
Diffstat (limited to 'gtk/gtktoolbutton.c')
-rw-r--r--gtk/gtktoolbutton.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index c8f8e4366f..6872f4b554 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -518,8 +518,8 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
else
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,0);
if (icon)
- gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE);
- gtk_box_pack_end (GTK_BOX (box), label, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (box), icon, TRUE);
+ gtk_box_pack_end (GTK_BOX (box), label, TRUE);
gtk_container_add (GTK_CONTAINER (button->priv->button), box);
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button");
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "text-button");
@@ -530,17 +530,17 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
{
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
if (icon)
- gtk_box_pack_start (GTK_BOX (box), icon, label? FALSE : TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (box), icon, TRUE);
if (label)
- gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE);
+ gtk_box_pack_end (GTK_BOX (box), label, TRUE);
}
else
{
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
if (icon)
- gtk_box_pack_end (GTK_BOX (box), icon, label ? FALSE : TRUE, TRUE);
+ gtk_box_pack_end (GTK_BOX (box), icon, TRUE);
if (label)
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE);
}
gtk_container_add (GTK_CONTAINER (button->priv->button), box);
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button");