diff options
author | Wolfgang Ulbrich <[email protected]> | 2016-01-24 02:30:34 +0100 |
---|---|---|
committer | Wolfgang Ulbrich <[email protected]> | 2016-01-24 02:30:34 +0100 |
commit | 9e3170e4b8de9b2120168b6de310ba839dc12072 (patch) | |
tree | 7c1f45722e7264db2fbe5e0f0ce45d4998cdf8ac /pluma/pluma-io-error-message-area.c | |
parent | 9d1bf65037d56ced8c3d4396902e83e286222914 (diff) | |
download | pluma-9e3170e4b8de9b2120168b6de310ba839dc12072.tar.bz2 pluma-9e3170e4b8de9b2120168b6de310ba839dc12072.tar.xz |
GTK3: fix previous GtkMisc deprecated commit
Diffstat (limited to 'pluma/pluma-io-error-message-area.c')
-rw-r--r-- | pluma/pluma-io-error-message-area.c | 85 |
1 files changed, 45 insertions, 40 deletions
diff --git a/pluma/pluma-io-error-message-area.c b/pluma/pluma-io-error-message-area.c index 450de637..4c9d7753 100644 --- a/pluma/pluma-io-error-message-area.c +++ b/pluma/pluma-io-error-message-area.c @@ -126,10 +126,11 @@ set_message_area_text_and_icon (GtkWidget *message_area, image = gtk_image_new_from_stock (icon_stock_id, GTK_ICON_SIZE_DIALOG); gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (image, GTK_ALIGN_CENTER); gtk_widget_set_valign (image, GTK_ALIGN_START); #else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); #endif vbox = gtk_vbox_new (FALSE, 6); @@ -141,10 +142,10 @@ set_message_area_text_and_icon (GtkWidget *message_area, gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (primary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); #endif gtk_widget_set_can_focus (primary_label, TRUE); gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE); @@ -160,10 +161,10 @@ set_message_area_text_and_icon (GtkWidget *message_area, gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5); #endif } @@ -526,10 +527,11 @@ create_conversion_error_message_area (const gchar *primary_text, image = gtk_image_new_from_stock ("gtk-dialog-error", GTK_ICON_SIZE_DIALOG); gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (image, GTK_ALIGN_CENTER); gtk_widget_set_valign (image, GTK_ALIGN_START); #else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); #endif vbox = gtk_vbox_new (FALSE, 6); @@ -541,10 +543,10 @@ create_conversion_error_message_area (const gchar *primary_text, gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (primary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); #endif gtk_widget_set_can_focus (primary_label, TRUE); gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE); @@ -560,10 +562,10 @@ create_conversion_error_message_area (const gchar *primary_text, gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5); #endif } @@ -803,10 +805,11 @@ pluma_file_already_open_warning_message_area_new (const gchar *uri) image = gtk_image_new_from_stock ("gtk-dialog-warning", GTK_ICON_SIZE_DIALOG); gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (image, GTK_ALIGN_CENTER); gtk_widget_set_valign (image, GTK_ALIGN_START); #else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); #endif vbox = gtk_vbox_new (FALSE, 6); @@ -822,10 +825,10 @@ pluma_file_already_open_warning_message_area_new (const gchar *uri) gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (primary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); #endif gtk_widget_set_can_focus (primary_label, TRUE); gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE); @@ -841,10 +844,10 @@ pluma_file_already_open_warning_message_area_new (const gchar *uri) gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5); #endif gtk_widget_show_all (hbox_content); @@ -906,10 +909,11 @@ pluma_externally_modified_saving_error_message_area_new ( image = gtk_image_new_from_stock ("gtk-dialog-warning", GTK_ICON_SIZE_DIALOG); gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (image, GTK_ALIGN_CENTER); gtk_widget_set_valign (image, GTK_ALIGN_START); #else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); #endif vbox = gtk_vbox_new (FALSE, 6); @@ -929,10 +933,10 @@ pluma_externally_modified_saving_error_message_area_new ( gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (primary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); #endif gtk_widget_set_can_focus (primary_label, TRUE); gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE); @@ -947,10 +951,10 @@ pluma_externally_modified_saving_error_message_area_new ( gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5); #endif gtk_widget_show_all (hbox_content); @@ -1013,10 +1017,11 @@ pluma_no_backup_saving_error_message_area_new (const gchar *uri, image = gtk_image_new_from_stock ("gtk-dialog-warning", GTK_ICON_SIZE_DIALOG); gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_halign (image, GTK_ALIGN_CENTER); gtk_widget_set_valign (image, GTK_ALIGN_START); #else - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); + gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); #endif vbox = gtk_vbox_new (FALSE, 6); @@ -1040,10 +1045,10 @@ pluma_no_backup_saving_error_message_area_new (const gchar *uri, gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (primary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); #endif gtk_widget_set_can_focus (primary_label, TRUE); gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE); @@ -1060,10 +1065,10 @@ pluma_no_backup_saving_error_message_area_new (const gchar *uri, gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5); #endif gtk_widget_show_all (hbox_content); |