diff options
| author | Timm Bäder <mail@baedert.org> | 2016-10-14 16:01:56 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2016-10-18 00:29:19 +0200 |
| commit | be2f19663bf9c1ead35fa69aee0292842ceada97 (patch) | |
| tree | d01d19b069b1823bb124847ad1feba82d1cb43b9 /tests/testbaseline.c | |
| parent | 37c728be12fd4c5664ca2c5ee9abd5c6c9973d0c (diff) | |
| download | gtk+-be2f19663bf9c1ead35fa69aee0292842ceada97.tar.gz | |
button: Add icon-name property
Remove the old-style button construction that allowed to show both an
icon and a label and change visibility based on a GtkSetting.
Diffstat (limited to 'tests/testbaseline.c')
| -rw-r--r-- | tests/testbaseline.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/tests/testbaseline.c b/tests/testbaseline.c index 2ae81c5ac3..30f4a1924a 100644 --- a/tests/testbaseline.c +++ b/tests/testbaseline.c @@ -173,11 +173,13 @@ main (int argc, for (i = 0; i < 3; i++) { - button = gtk_button_new_with_label ("│Xyj,Ö"); + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_icon_name ("face-sad", GTK_ICON_SIZE_BUTTON)); - gtk_button_set_always_show_image (GTK_BUTTON (button), TRUE); + gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("│Xyj,Ö")); + gtk_container_add (GTK_CONTAINER (box), + gtk_image_new_from_icon_name ("face-sad", GTK_ICON_SIZE_BUTTON)); + gtk_container_add (GTK_CONTAINER (button), box); set_font_size (button, i); @@ -270,11 +272,13 @@ main (int argc, for (i = 0; i < 3; i++) { - button = gtk_button_new_with_label ("│Xyj,Ö"); + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_icon_name ("face-sad", GTK_ICON_SIZE_BUTTON)); - gtk_button_set_always_show_image (GTK_BUTTON (button), TRUE); + gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("│Xyj,Ö")); + gtk_container_add (GTK_CONTAINER (box), + gtk_image_new_from_icon_name ("face-sad", GTK_ICON_SIZE_BUTTON)); + gtk_container_add (GTK_CONTAINER (button), box); set_font_size (button, i); @@ -358,14 +362,17 @@ main (int argc, for (i = 0; i < 3; i++) { - button = gtk_button_new_with_label ("│Xyj,Ö"); + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + button = gtk_button_new (); + + gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("│Xyj,Ö")); + image = gtk_image_new_from_icon_name ("face-sad", GTK_ICON_SIZE_BUTTON); + gtk_image_set_pixel_size (GTK_IMAGE (image), 16); + gtk_container_add (GTK_CONTAINER (box), image); + gtk_container_add (GTK_CONTAINER (button), box); - image = gtk_image_new_from_icon_name ("face-sad", GTK_ICON_SIZE_BUTTON); - gtk_image_set_pixel_size (GTK_IMAGE (image), 16); - gtk_button_set_image (GTK_BUTTON (button), image); if (i == 0) g_signal_connect (spin2, "value-changed", (GCallback)image_size_value_changed, image); - gtk_button_set_always_show_image (GTK_BUTTON (button), TRUE); set_font_size (button, i); |