diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-25 19:50:59 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-25 19:50:59 +0100 |
| commit | 979f370f721aa269cd00df542c9c17940af86782 (patch) | |
| tree | b402f8e05c78d042aaa2e89c7c2c4fdb0d57f665 /src/eom-window.c | |
| parent | 4e7953d89dbe3e3166dd13a33669f02b2837811b (diff) | |
| download | eom-979f370f721aa269cd00df542c9c17940af86782.tar.bz2 eom-979f370f721aa269cd00df542c9c17940af86782.tar.xz | |
GTK3: fix previous GtkMisc deprecation commit
Diffstat (limited to 'src/eom-window.c')
| -rw-r--r-- | src/eom-window.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/eom-window.c b/src/eom-window.c index db0240e..31be7c0 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -829,14 +829,17 @@ image_file_changed_cb (EomImage *img, EomWindow *window) hbox = gtk_hbox_new (FALSE, 8); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_valign (image, GTK_ALIGN_START); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (image, GTK_ALIGN_START); + gtk_widget_set_valign (image, GTK_ALIGN_END); #else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); +#endif gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); +#else + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar))), hbox, TRUE, TRUE, 0); gtk_widget_show_all (hbox); @@ -2743,14 +2746,17 @@ eom_window_set_wallpaper (EomWindow *window, const gchar *filename, const gchar hbox = gtk_hbox_new (FALSE, 8); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_valign (image, GTK_ALIGN_START); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (image, GTK_ALIGN_START); + gtk_widget_set_valign (image, GTK_ALIGN_END); #else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); +#endif gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); +#else + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar))), hbox, TRUE, TRUE, 0); gtk_widget_show_all (hbox); |