From 9dfeee81276832960dd63571a554d92c34cde0f0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 7 Nov 2010 11:22:07 -0500 Subject: [PATCH] Make GtkFileChooserButton behave as expected when expanding --- gtk/gtkfilechooserbutton.c | 3 ++- tests/testfilechooserbutton.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index d0b0268d1..3db63bf8d 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -452,7 +452,8 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button) priv->label = gtk_label_new (_(FALLBACK_DISPLAY_NAME)); gtk_label_set_ellipsize (GTK_LABEL (priv->label), PANGO_ELLIPSIZE_END); gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5); - gtk_container_add (GTK_CONTAINER (box), priv->label); + gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0); + //gtk_container_add (GTK_CONTAINER (box), priv->label); gtk_widget_show (priv->label); sep = gtk_separator_new (GTK_ORIENTATION_VERTICAL); diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c index 329c64a4e..45c81bdb3 100644 --- a/tests/testfilechooserbutton.c +++ b/tests/testfilechooserbutton.c @@ -327,7 +327,7 @@ main (int argc, g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL); g_signal_connect (chooser, "file-activated", G_CALLBACK (chooser_file_activated_cb), NULL); g_signal_connect (chooser, "update-preview", G_CALLBACK (chooser_update_preview_cb), NULL); - gtk_container_add (GTK_CONTAINER (hbox), chooser); + gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE, 0); button = gtk_button_new_from_stock (GTK_STOCK_PROPERTIES); g_signal_connect (button, "clicked", G_CALLBACK (properties_button_clicked_cb), chooser); @@ -357,7 +357,7 @@ main (int argc, g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL); g_signal_connect (chooser, "file-activated", G_CALLBACK (chooser_file_activated_cb), NULL); g_signal_connect (chooser, "update-preview", G_CALLBACK (chooser_update_preview_cb), NULL); - gtk_container_add (GTK_CONTAINER (hbox), chooser); + gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE, 0); button = gtk_button_new_from_stock (GTK_STOCK_PROPERTIES); g_signal_connect (button, "clicked", G_CALLBACK (properties_button_clicked_cb), chooser); -- 2.43.2