diff options
Diffstat (limited to 'gtk/gtktoolbutton.c')
| -rw-r--r-- | gtk/gtktoolbutton.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 6232043f10..dca1aa288d 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -503,9 +503,11 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); else box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,0); + if (icon) - gtk_box_pack_start (GTK_BOX (box), icon); - gtk_box_pack_end (GTK_BOX (box), label); + gtk_container_add (GTK_CONTAINER (box), icon); + + gtk_container_add (GTK_CONTAINER (box), label); 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"); @@ -517,24 +519,24 @@ 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); + gtk_container_add (GTK_CONTAINER (box), icon); if (!label) gtk_widget_set_hexpand (icon, TRUE); } if (label) - gtk_box_pack_end (GTK_BOX (box), label); + gtk_container_add (GTK_CONTAINER (box), label); } else { box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); if (icon) { - gtk_box_pack_end (GTK_BOX (box), icon); + gtk_container_add (GTK_CONTAINER (box), icon); if (!label) gtk_widget_set_vexpand (icon, TRUE); } if (label) - gtk_box_pack_start (GTK_BOX (box), label); + gtk_container_add (GTK_CONTAINER (box), label); } gtk_container_add (GTK_CONTAINER (button->priv->button), box); gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button"); |