wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

GTK3: fix previous GtkMisc deprecated commit

This commit is contained in:
Wolfgang Ulbrich 2016-01-24 02:30:34 +01:00
parent 9d1bf65037
commit 9e3170e4b8
8 changed files with 82 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/spell/pluma-automatic-spell-checker.c
View File

@ -454,8 +454,8 @@ build_suggestion_menu (PlumaAutomaticSpellChecker *spell, const gchar *word)
label = gtk_label_new (label_text); label = gtk_label_new (label_text);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
#endif #endif

30
pluma/dialogs/pluma-close-confirmation-dialog.c
View File

@ -509,8 +509,9 @@ build_single_doc_dialog (PlumaCloseConfirmationDialog *dlg)
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
GTK_ICON_SIZE_DIALOG); GTK_ICON_SIZE_DIALOG);
#endif #endif
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_valign (image, GTK_ALIGN_START); gtk_widget_set_halign (image, GTK_ALIGN_START);
gtk_widget_set_valign (image, GTK_ALIGN_END);
#else #else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
#endif #endif
@ -519,8 +520,8 @@ build_single_doc_dialog (PlumaCloseConfirmationDialog *dlg)
primary_label = gtk_label_new (NULL); primary_label = gtk_label_new (NULL);
gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (primary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
#endif #endif
@ -556,8 +557,8 @@ build_single_doc_dialog (PlumaCloseConfirmationDialog *dlg)
secondary_label = gtk_label_new (str); secondary_label = gtk_label_new (str);
g_free (str); g_free (str);
gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5);
#endif #endif
@ -711,7 +712,8 @@ build_multiple_docs_dialog (PlumaCloseConfirmationDialog *dlg)
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
GTK_ICON_SIZE_DIALOG); GTK_ICON_SIZE_DIALOG);
#endif #endif
#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); gtk_widget_set_valign (image, GTK_ALIGN_START);
#else #else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
@ -725,8 +727,8 @@ build_multiple_docs_dialog (PlumaCloseConfirmationDialog *dlg)
primary_label = gtk_label_new (NULL); primary_label = gtk_label_new (NULL);
gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (primary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
#endif #endif
@ -764,8 +766,8 @@ build_multiple_docs_dialog (PlumaCloseConfirmationDialog *dlg)
gtk_box_pack_start (GTK_BOX (vbox2), select_label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox2), select_label, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (select_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (select_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (select_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (select_label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (select_label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (select_label), 0.0, 0.5);
#endif #endif
@ -790,10 +792,10 @@ build_multiple_docs_dialog (PlumaCloseConfirmationDialog *dlg)
gtk_box_pack_start (GTK_BOX (vbox2), secondary_label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox2), secondary_label, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
#else #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 #endif
gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);

8
pluma/pluma-file-chooser-dialog.c
View File

@ -86,8 +86,8 @@ create_option_menu (PlumaFileChooserDialog *dialog)
GtkWidget *menu; GtkWidget *menu;
label = gtk_label_new_with_mnemonic (_("C_haracter Encoding:")); label = gtk_label_new_with_mnemonic (_("C_haracter Encoding:"));
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
#endif #endif
@ -155,8 +155,8 @@ create_newline_combo (PlumaFileChooserDialog *dialog)
GtkTreeIter iter; GtkTreeIter iter;
label = gtk_label_new_with_mnemonic (_("L_ine Ending:")); label = gtk_label_new_with_mnemonic (_("L_ine Ending:"));
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
#endif #endif

85
pluma/pluma-io-error-message-area.c
View File

@ -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); 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); 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); gtk_widget_set_valign (image, GTK_ALIGN_START);
#else #else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
#endif #endif
vbox = gtk_vbox_new (FALSE, 6); 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_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (primary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
#else #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 #endif
gtk_widget_set_can_focus (primary_label, TRUE); gtk_widget_set_can_focus (primary_label, TRUE);
gtk_label_set_selectable (GTK_LABEL (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_use_markup (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
#else #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 #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); 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); 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); gtk_widget_set_valign (image, GTK_ALIGN_START);
#else #else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
#endif #endif
vbox = gtk_vbox_new (FALSE, 6); 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_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (primary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
#else #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 #endif
gtk_widget_set_can_focus (primary_label, TRUE); gtk_widget_set_can_focus (primary_label, TRUE);
gtk_label_set_selectable (GTK_LABEL (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_use_markup (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
#else #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 #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); 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); 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); gtk_widget_set_valign (image, GTK_ALIGN_START);
#else #else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
#endif #endif
vbox = gtk_vbox_new (FALSE, 6); 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_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (primary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
#else #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 #endif
gtk_widget_set_can_focus (primary_label, TRUE); gtk_widget_set_can_focus (primary_label, TRUE);
gtk_label_set_selectable (GTK_LABEL (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_use_markup (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
#else #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 #endif
gtk_widget_show_all (hbox_content); 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); 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); 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); gtk_widget_set_valign (image, GTK_ALIGN_START);
#else #else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
#endif #endif
vbox = gtk_vbox_new (FALSE, 6); 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_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (primary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
#else #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 #endif
gtk_widget_set_can_focus (primary_label, TRUE); gtk_widget_set_can_focus (primary_label, TRUE);
gtk_label_set_selectable (GTK_LABEL (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_use_markup (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
#else #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 #endif
gtk_widget_show_all (hbox_content); 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); 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); 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); gtk_widget_set_valign (image, GTK_ALIGN_START);
#else #else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
#endif #endif
vbox = gtk_vbox_new (FALSE, 6); 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_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (primary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
#else #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 #endif
gtk_widget_set_can_focus (primary_label, TRUE); gtk_widget_set_can_focus (primary_label, TRUE);
gtk_label_set_selectable (GTK_LABEL (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_use_markup (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (secondary_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
#else #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 #endif
gtk_widget_show_all (hbox_content); gtk_widget_show_all (hbox_content);

10
pluma/pluma-panel.c
View File

@ -547,8 +547,8 @@ build_vertical_panel (PlumaPanel *panel)
0); 0);
panel->priv->title_label = gtk_label_new (_("Empty")); panel->priv->title_label = gtk_label_new (_("Empty"));
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (panel->priv->title_label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (panel->priv->title_label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (panel->priv->title_label), 0, 0.5); gtk_misc_set_alignment (GTK_MISC (panel->priv->title_label), 0, 0.5);
#endif #endif
@ -649,8 +649,8 @@ build_tab_label (PlumaPanel *panel,
/* setup label */ /* setup label */
label = gtk_label_new (name); label = gtk_label_new (name);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_widget_set_margin_start (label, 0); gtk_widget_set_margin_start (label, 0);
gtk_widget_set_margin_end (label, 0); gtk_widget_set_margin_end (label, 0);
gtk_widget_set_margin_top (label, 0); gtk_widget_set_margin_top (label, 0);
@ -724,7 +724,7 @@ pluma_panel_add_item (PlumaPanel *panel,
tab_label = build_tab_label (panel, item, data->name, data->icon); tab_label = build_tab_label (panel, item, data->name, data->icon);
menu_label = gtk_label_new (name); menu_label = gtk_label_new (name);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (menu_label, GTK_ALIGN_START); gtk_widget_set_halign (menu_label, GTK_ALIGN_START);
#else #else
gtk_misc_set_alignment (GTK_MISC (menu_label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (menu_label), 0.0, 0.5);

4
pluma/pluma-plugin-manager.c
View File

@ -808,8 +808,8 @@ pluma_plugin_manager_init (PlumaPluginManager *pm)
label = gtk_label_new_with_mnemonic (_("Active _Plugins:")); label = gtk_label_new_with_mnemonic (_("Active _Plugins:"));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
#endif #endif

8
pluma/pluma-progress-message-area.c
View File

@ -153,7 +153,7 @@ pluma_progress_message_area_init (PlumaProgressMessageArea *area)
area->priv->image = gtk_image_new_from_icon_name (GTK_STOCK_MISSING_IMAGE, area->priv->image = gtk_image_new_from_icon_name (GTK_STOCK_MISSING_IMAGE,
GTK_ICON_SIZE_SMALL_TOOLBAR); GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_widget_show (area->priv->image); gtk_widget_show (area->priv->image);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (area->priv->image, GTK_ALIGN_CENTER); gtk_widget_set_halign (area->priv->image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (area->priv->image, GTK_ALIGN_CENTER); gtk_widget_set_valign (area->priv->image, GTK_ALIGN_CENTER);
#else #else
@ -165,10 +165,10 @@ pluma_progress_message_area_init (PlumaProgressMessageArea *area)
gtk_widget_show (area->priv->label); gtk_widget_show (area->priv->label);
gtk_box_pack_start (GTK_BOX (hbox), area->priv->label, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), area->priv->label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (area->priv->label), TRUE); gtk_label_set_use_markup (GTK_LABEL (area->priv->label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (area->priv->label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (area->priv->label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (area->priv->label), 0, 0.5); gtk_misc_set_alignment (GTK_MISC (area->priv->label), 0.0, 0.5);
#endif #endif
gtk_label_set_ellipsize (GTK_LABEL (area->priv->label), gtk_label_set_ellipsize (GTK_LABEL (area->priv->label),
PANGO_ELLIPSIZE_END); PANGO_ELLIPSIZE_END);

8
pluma/pluma-status-combo-box.c
View File

@ -287,8 +287,8 @@ pluma_status_combo_box_init (PlumaStatusComboBox *self)
gtk_widget_show (self->priv->label); gtk_widget_show (self->priv->label);
gtk_label_set_single_line_mode (GTK_LABEL (self->priv->label), TRUE); gtk_label_set_single_line_mode (GTK_LABEL (self->priv->label), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 16, 0)
gtk_widget_set_halign (self->priv->label, GTK_ALIGN_START); gtk_label_set_xalign (GTK_LABEL (self->priv->label), 0.0);
#else #else
gtk_misc_set_alignment (GTK_MISC (self->priv->label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (self->priv->label), 0.0, 0.5);
#endif #endif
@ -299,7 +299,7 @@ pluma_status_combo_box_init (PlumaStatusComboBox *self)
gtk_widget_show (self->priv->item); gtk_widget_show (self->priv->item);
gtk_label_set_single_line_mode (GTK_LABEL (self->priv->item), TRUE); gtk_label_set_single_line_mode (GTK_LABEL (self->priv->item), TRUE);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (self->priv->item, GTK_ALIGN_START); gtk_widget_set_halign (self->priv->item, GTK_ALIGN_START);
#else #else
gtk_misc_set_alignment (GTK_MISC (self->priv->item), 0, 0.5); gtk_misc_set_alignment (GTK_MISC (self->priv->item), 0, 0.5);
@ -309,7 +309,7 @@ pluma_status_combo_box_init (PlumaStatusComboBox *self)
self->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); self->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_widget_show (self->priv->arrow); gtk_widget_show (self->priv->arrow);
#if GTK_CHECK_VERSION (3, 14, 0) #if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (self->priv->arrow, GTK_ALIGN_CENTER); gtk_widget_set_halign (self->priv->arrow, GTK_ALIGN_CENTER);
gtk_widget_set_valign (self->priv->arrow, GTK_ALIGN_CENTER); gtk_widget_set_valign (self->priv->arrow, GTK_ALIGN_CENTER);
#else #else