trace-view: Add compat functions for older GTK

Some of the functions that were used to make the fixed width
columns are not available for older GTK. This patch adds
compat functions that implement code that lets this compile
with older versions of GTK.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

4 files changed, 38 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index e75e2e0..6538c97 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ trace-graph.o::		$(HEADERS) trace-graph.h
 trace-graph-main.o::    $(HEADERS) trace-graph.h
 kernel-shark.o::        $(HEADERS) kernel-shark.h
 
-TRACE_VIEW_OBJS = trace-view.o trace-view-store.o trace-filter.o
+TRACE_VIEW_OBJS = trace-view.o trace-view-store.o trace-filter.o trace-compat.o
 
 trace-cmd:: trace-cmd.o trace-read.o
         $(CC) $^ -rdynamic -o $@ $(LIBS)
diff --git a/trace-compat.c b/trace-compat.c
index b12af1c..9c1d7e3 100644
--- a/trace-compat.c
+++ b/trace-compat.c
@@ -1,5 +1,18 @@
 #include "trace-compat.h"
 
+#if GTK_VERSION < CALC_GTK_VERSION(2,18,0)
+
+void gtk_cell_renderer_get_padding(GtkCellRenderer *cell,
+                                   gint *xpad, gint *ypad)
+{
+        if (xpad)
+                *xpad = cell->xpad;
+        if (ypad)
+                *ypad = cell->ypad;
+}
+
+#endif /* version < 2.18.0 */
+
 #if GTK_VERSION < CALC_GTK_VERSION(2,14,0)
 
 gdouble gtk_adjustment_get_page_size(GtkAdjustment *adj)
@@ -18,3 +31,12 @@ gdouble gtk_adjustment_get_lower(GtkAdjustment *adj)
 }
 
 #endif /* version < 2.14.0 */
+
+#if GTK_VERSION < CALC_GTK_VERSION(2,12,0)
+
+GtkWidget *gtk_tree_view_column_get_tree_view(GtkTreeViewColumn *col)
+{
+        return col->tree_view;
+}
+
+#endif /* version < 2.12.0 */
diff --git a/trace-compat.h b/trace-compat.h
index ffc18c3..381fc6c 100644
--- a/trace-compat.h
+++ b/trace-compat.h
@@ -5,12 +5,25 @@
 
 #define CALC_GTK_VERSION(maj, min, ext) ((maj << 16) + (min << 8) + ext)
 
+#if GTK_VERSION < CALC_GTK_VERSION(2,18,0)
+
+void gtk_cell_renderer_get_padding(GtkCellRenderer *cell,
+                                   gint *xpad, gint *ypad);
+
+#endif /* version < 2.18.0 */
+
 #if GTK_VERSION < CALC_GTK_VERSION(2,14,0)
 
 gdouble gtk_adjustment_get_page_size(GtkAdjustment *adj);
 gdouble gtk_adjustment_get_upper(GtkAdjustment *adj);
 gdouble gtk_adjustment_get_lower(GtkAdjustment *adj);
 
-#endif
+#endif /* version < 2.14.0 */
+
+#if GTK_VERSION < CALC_GTK_VERSION(2,12,0)
+
+GtkWidget *gtk_tree_view_column_get_tree_view(GtkTreeViewColumn *col);
+
+#endif /* version < 2.12.0 */
 
 #endif /* _TRACE_COMPAT_H */
diff --git a/trace-view.c b/trace-view.c
index d4a5bbd..e99a8af 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -27,6 +27,7 @@
 #include "trace-cmd.h"
 #include "trace-local.h"
 #include "trace-view.h"
+#include "trace-compat.h"
 
 enum {
         COL_INDEX,