diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-11-29 22:03:16 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-01 21:02:26 +0100 |
| commit | 4534e68bb0cb31734be338efa06cb6d3e00180f6 (patch) | |
| tree | 185d1105ddb4c11907a271a80e267c595b32af39 | |
| parent | 370380d307344bfc5ab8c87142b12009937d48d6 (diff) | |
| download | mate-system-monitor-4534e68bb0cb31734be338efa06cb6d3e00180f6.tar.bz2 mate-system-monitor-4534e68bb0cb31734be338efa06cb6d3e00180f6.tar.xz | |
GTK3: don't use deprecated gtk_{v/h}-box
| -rw-r--r-- | src/disks.cpp | 4 | ||||
| -rw-r--r-- | src/interface.cpp | 5 | ||||
| -rw-r--r-- | src/load-graph.cpp | 3 | ||||
| -rw-r--r-- | src/lsof.cpp | 4 | ||||
| -rw-r--r-- | src/openfiles.cpp | 5 | ||||
| -rw-r--r-- | src/procdialogs.cpp | 5 | ||||
| -rw-r--r-- | src/procproperties.cpp | 5 | ||||
| -rw-r--r-- | src/sysinfo.cpp | 4 |
8 files changed, 35 insertions, 0 deletions
diff --git a/src/disks.cpp b/src/disks.cpp index a28983a..ee7f4dd 100644 --- a/src/disks.cpp +++ b/src/disks.cpp @@ -13,6 +13,10 @@ #include "interface.h" #include "iconthemewrapper.h" +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif + enum DiskColumns { /* string columns* */ diff --git a/src/interface.cpp b/src/interface.cpp index 738f564..d981c9a 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -41,6 +41,11 @@ #include "sysinfo.h" #include "gsm_color_button.h" +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif + static void cb_toggle_tree (GtkAction *action, gpointer data); static void cb_proc_goto_tab (gint tab); diff --git a/src/load-graph.cpp b/src/load-graph.cpp index fa933d3..ce2e263 100644 --- a/src/load-graph.cpp +++ b/src/load-graph.cpp @@ -28,6 +28,9 @@ #include "util.h" #include "gsm_color_button.h" +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif void LoadGraph::clear_background() { diff --git a/src/lsof.cpp b/src/lsof.cpp index 6854de2..4c1f13a 100644 --- a/src/lsof.cpp +++ b/src/lsof.cpp @@ -21,6 +21,10 @@ #include "lsof.h" #include "util.h" +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif using std::string; diff --git a/src/openfiles.cpp b/src/openfiles.cpp index 891ff2f..d828516 100644 --- a/src/openfiles.cpp +++ b/src/openfiles.cpp @@ -19,6 +19,11 @@ #define NI_IDN 0 #endif +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif + enum { COL_FD, diff --git a/src/procdialogs.cpp b/src/procdialogs.cpp index 1fde60a..0f29c14 100644 --- a/src/procdialogs.cpp +++ b/src/procdialogs.cpp @@ -37,6 +37,11 @@ #include "procman_gksu.h" #include "cgroups.h" +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif + static GtkWidget *renice_dialog = NULL; static GtkWidget *prefs_dialog = NULL; static gint new_nice_value = 0; diff --git a/src/procproperties.cpp b/src/procproperties.cpp index 200e6f5..d2f8b55 100644 --- a/src/procproperties.cpp +++ b/src/procproperties.cpp @@ -31,6 +31,11 @@ #include "util.h" #include "e_date.h" +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif + enum { COL_PROP = 0, diff --git a/src/sysinfo.cpp b/src/sysinfo.cpp index 968105f..16a34aa 100644 --- a/src/sysinfo.cpp +++ b/src/sysinfo.cpp @@ -31,6 +31,10 @@ #include "procman.h" #include "util.h" +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif using std::string; using std::vector; |