From 1241ff234a8ec46542e97e48a6298b78c9a0d2b5 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Sat, 23 Jan 2016 00:04:15 +0100 Subject: GTK3: fix deprecated GtkMisc --- src/file-manager/fm-directory-view.c | 10 +++++----- src/file-manager/fm-ditem-page.c | 4 ++-- src/file-manager/fm-list-view.c | 6 +++--- src/file-manager/fm-properties-window.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/file-manager') diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 2c65cec7..031dd8d2 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1231,7 +1231,7 @@ select_pattern (FMDirectoryView *view) "*.png, file\?\?.txt, pict*.\?\?\?"); gtk_label_set_markup (GTK_LABEL (example), example_pattern); g_free (example_pattern); -#if GTK_CHECK_VERSION (3, 14, 0) +#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_halign (example, GTK_ALIGN_START); #else gtk_misc_set_alignment (GTK_MISC (example), 0.0, 0.5); @@ -1407,8 +1407,8 @@ action_save_search_as_callback (GtkAction *action, #endif label = gtk_label_new_with_mnemonic (_("Search _name:")); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#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 @@ -1435,8 +1435,8 @@ action_save_search_as_callback (GtkAction *action, gtk_widget_show (entry); label = gtk_label_new_with_mnemonic (_("_Folder:")); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#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 diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c index 16cd204f..13803597 100644 --- a/src/file-manager/fm-ditem-page.c +++ b/src/file-manager/fm-ditem-page.c @@ -362,8 +362,8 @@ build_table (GtkWidget *container, label = gtk_label_new (label_text); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); g_free (label_text); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#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 diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index d797df55..71b7f65d 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -2549,9 +2549,9 @@ create_column_editor (FMListView *view) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), str); gtk_label_set_line_wrap (GTK_LABEL (label), FALSE); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0); + gtk_label_set_yalign (GTK_LABEL (label), 0); #else gtk_misc_set_alignment (GTK_MISC (label), 0, 0); #endif diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 096283dd..a3fc7278 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -1464,8 +1464,8 @@ attach_label (GtkTable *table, eel_gtk_label_make_bold (GTK_LABEL (label_field)); } #endif -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label_field, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label_field), 0); #else gtk_misc_set_alignment (GTK_MISC (label_field), right_aligned ? 1 : 0, 0.5); #endif -- cgit v1.2.1