summaryrefslogtreecommitdiff
path: root/src/interface.cpp
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-12-13 13:11:31 +0300
committermonsta <[email protected]>2016-01-11 14:05:07 +0300
commit2194bbaf2511234c726e3e1ec8a361c5a62ffce9 (patch)
tree0b998a24f560cd7b3bc65bc56be842dfcab5c201 /src/interface.cpp
parentcbb995375f1b97679fd42090e31277666249cc84 (diff)
downloadmate-system-monitor-2194bbaf2511234c726e3e1ec8a361c5a62ffce9.tar.bz2
mate-system-monitor-2194bbaf2511234c726e3e1ec8a361c5a62ffce9.tar.xz
set minimum GTK+ version to 3.14 and drop some deprecated code
Diffstat (limited to 'src/interface.cpp')
-rw-r--r--src/interface.cpp56
1 files changed, 0 insertions, 56 deletions
diff --git a/src/interface.cpp b/src/interface.cpp
index fd18ba1..e73c313 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -251,11 +251,7 @@ make_title_label (const char *text)
label = gtk_label_new (full);
g_free (full);
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_widget_set_halign (label, GTK_ALIGN_START);
-#else
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
-#endif
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
return label;
@@ -350,11 +346,7 @@ create_sys_view (ProcData *procdata)
g_free (label_text);
cpu_label = gtk_label_new (NULL);
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_widget_set_halign (cpu_label, GTK_ALIGN_START);
-#else
- gtk_misc_set_alignment (GTK_MISC (cpu_label), 0.0, 0.5);
-#endif
gtk_box_pack_start (GTK_BOX (temp_hbox), cpu_label, TRUE, TRUE, 0);
load_graph_get_labels(cpu_graph)->cpu[i] = cpu_label;
@@ -410,11 +402,7 @@ create_sys_view (ProcData *procdata)
label = gtk_label_new (label_text);
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_table_attach (GTK_TABLE (table), label, 1, 7, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table),
@@ -445,11 +433,7 @@ create_sys_view (ProcData *procdata)
label = gtk_label_new (label_text);
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_table_attach (GTK_TABLE (table), label, 1, 7, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table),
@@ -515,42 +499,22 @@ create_sys_view (ProcData *procdata)
label = gtk_label_new (label_text);
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_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_widget_set_halign (load_graph_get_labels(net_graph)->net_in, GTK_ALIGN_END);
gtk_widget_set_valign (load_graph_get_labels(net_graph)->net_in, GTK_ALIGN_CENTER);
-#else
- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in),
- 1.0,
- 0.5);
-#endif
gtk_widget_set_size_request(GTK_WIDGET(load_graph_get_labels(net_graph)->net_in), 100, -1);
gtk_table_attach (GTK_TABLE (table), load_graph_get_labels(net_graph)->net_in, 2, 3, 0, 1,
static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), GTK_FILL, 0, 0);
label = gtk_label_new (_("Total Received"));
-#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, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_widget_set_halign (load_graph_get_labels(net_graph)->net_in_total, GTK_ALIGN_END);
gtk_widget_set_valign (load_graph_get_labels(net_graph)->net_in_total, GTK_ALIGN_CENTER);
-#else
- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in_total),
- 1.0,
- 0.5);
-#endif
gtk_table_attach (GTK_TABLE (table),
load_graph_get_labels(net_graph)->net_in_total,
2,
@@ -585,42 +549,22 @@ create_sys_view (ProcData *procdata)
label = gtk_label_new (label_text);
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_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_widget_set_halign (load_graph_get_labels(net_graph)->net_out, GTK_ALIGN_END);
gtk_widget_set_valign (load_graph_get_labels(net_graph)->net_out, GTK_ALIGN_CENTER);
-#else
- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out),
- 1.0,
- 0.5);
-#endif
gtk_widget_set_size_request(GTK_WIDGET(load_graph_get_labels(net_graph)->net_out), 100, -1);
gtk_table_attach (GTK_TABLE (table), load_graph_get_labels(net_graph)->net_out, 2, 3, 0, 1,
static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), GTK_FILL, 0, 0);
label = gtk_label_new (_("Total Sent"));
-#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, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_widget_set_halign (load_graph_get_labels(net_graph)->net_out_total, GTK_ALIGN_END);
gtk_widget_set_valign (load_graph_get_labels(net_graph)->net_out_total, GTK_ALIGN_CENTER);
-#else
- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out_total),
- 1.0,
- 0.5);
-#endif
gtk_table_attach (GTK_TABLE (table),
load_graph_get_labels(net_graph)->net_out_total,
2,