summaryrefslogtreecommitdiff
path: root/src/file-manager
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-09-26 17:05:23 +0200
committermonsta <[email protected]>2015-10-19 16:31:56 +0300
commit597e229c69cf05e734ce0a08cc8ad1af4b2ebae8 (patch)
tree4a82733244da39d82f29f16c83f18c4222815a33 /src/file-manager
parent5609227c672d94e54edec26e2b4db5f9e1697e17 (diff)
downloadcaja-597e229c69cf05e734ce0a08cc8ad1af4b2ebae8.tar.bz2
caja-597e229c69cf05e734ce0a08cc8ad1af4b2ebae8.tar.xz
GTK3: do not use deprecated gtk_misc_set_alignment
Diffstat (limited to 'src/file-manager')
-rw-r--r--src/file-manager/fm-directory-view.c12
-rw-r--r--src/file-manager/fm-ditem-page.c4
-rw-r--r--src/file-manager/fm-list-view.c5
-rw-r--r--src/file-manager/fm-properties-window.c4
4 files changed, 25 insertions, 0 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 157e0f95..80815dcd 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1219,7 +1219,11 @@ 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)
+ gtk_widget_set_halign (example, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (example), 0.0, 0.5);
+#endif
entry = gtk_entry_new ();
gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
@@ -1354,7 +1358,11 @@ action_save_search_as_callback (GtkAction *action,
gtk_widget_show (table);
label = gtk_label_new_with_mnemonic (_("Search _name:"));
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
+#endif
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
gtk_widget_show (label);
entry = gtk_entry_new ();
@@ -1368,7 +1376,11 @@ 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);
+#else
gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
+#endif
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
gtk_widget_show (label);
diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c
index b08417a2..c3b75b65 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@@ -346,7 +346,11 @@ 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);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+#endif
gtk_size_group_add_widget (label_size_group, label);
entry = gtk_entry_new ();
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 075e8c00..dc9bc20b 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -2547,7 +2547,12 @@ 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);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
+#endif
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index dcb9374e..6edb01ee 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -1397,7 +1397,11 @@ attach_label (GtkTable *table,
if (bold) {
eel_gtk_label_make_bold (GTK_LABEL (label_field));
}
+#if GTK_CHECK_VERSION (3, 14, 0)
+ gtk_widget_set_halign (label_field, right_aligned ? 1 :GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (label_field), right_aligned ? 1 : 0, 0.5);
+#endif
gtk_widget_show (label_field);
gtk_table_attach (table, label_field,
column, column + 1,