From 3b3214d32bd3b1ed0fbf850c3e11412940d3d6e4 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 14 Feb 2019 18:04:44 -0200 Subject: [PATCH] Fixing RHEL7 build issues. --- src/dialogs/commondialog.c | 4 ++++ src/include/internals.h | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/dialogs/commondialog.c b/src/dialogs/commondialog.c index 1cd1e5a..157fd84 100644 --- a/src/dialogs/commondialog.c +++ b/src/dialogs/commondialog.c @@ -113,6 +113,8 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *titl GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget) { +#if GTK_CHECK_VERSION(3,12,0) + gboolean use_header = FALSE; g_object_get(G_OBJECT(widget), "use-header-bar", &use_header, NULL); @@ -120,5 +122,7 @@ GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget) if(use_header) return GTK_HEADER_BAR(gtk_dialog_get_header_bar(GTK_DIALOG(widget))); +#endif // GTK 3.12 + return NULL; } diff --git a/src/include/internals.h b/src/include/internals.h index 8e1a314..dedbcd4 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -53,6 +53,11 @@ G_GNUC_INTERNAL GtkWidget * v3270_box_pack_frame(GtkWidget *box, GtkWidget *child, const gchar *title, GtkAlign align, gboolean expand, gboolean fill, guint padding); G_GNUC_INTERNAL GtkWidget * v3270_dialog_create_grid(GtkAlign align); G_GNUC_INTERNAL GtkWidget * v3270_dialog_create_frame(GtkWidget * child, const gchar *title); + +#if ! GTK_CHECK_VERSION(3,12,0) + #define GtkHeaderBar GtkWidget +#endif // ! GTK 3.12 + G_GNUC_INTERNAL GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget); // Activity list widget. -- libgit2 0.21.2