Download as
Browse Code »

Commit 3b3214d32bd3b1ed0fbf850c3e11412940d3d6e4

Authored by Perry Werneck
1 parent 5a8093cb
Exists in master and in 1 other branch develop

Fixing RHEL7 build issues.

Showing 2 changed files with 9 additions and 0 deletions   Show diff stats
src/dialogs/commondialog.c
  Diff comments   View file @3b3214d
@@ -113,6 +113,8 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *titl @@ -113,6 +113,8 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *titl
113 113
114 GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget) 114 GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget)
115 { 115 {
  116 +#if GTK_CHECK_VERSION(3,12,0)
  117 +
116 gboolean use_header = FALSE; 118 gboolean use_header = FALSE;
117 119
118 g_object_get(G_OBJECT(widget), "use-header-bar", &use_header, NULL); 120 g_object_get(G_OBJECT(widget), "use-header-bar", &use_header, NULL);
@@ -120,5 +122,7 @@ GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget) @@ -120,5 +122,7 @@ GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget)
120 if(use_header) 122 if(use_header)
121 return GTK_HEADER_BAR(gtk_dialog_get_header_bar(GTK_DIALOG(widget))); 123 return GTK_HEADER_BAR(gtk_dialog_get_header_bar(GTK_DIALOG(widget)));
122 124
  125 +#endif // GTK 3.12
  126 +
123 return NULL; 127 return NULL;
124 } 128 }
src/include/internals.h
  Diff comments   View file @3b3214d
@@ -53,6 +53,11 @@ @@ -53,6 +53,11 @@
53 G_GNUC_INTERNAL GtkWidget * v3270_box_pack_frame(GtkWidget *box, GtkWidget *child, const gchar *title, GtkAlign align, gboolean expand, gboolean fill, guint padding); 53 G_GNUC_INTERNAL GtkWidget * v3270_box_pack_frame(GtkWidget *box, GtkWidget *child, const gchar *title, GtkAlign align, gboolean expand, gboolean fill, guint padding);
54 G_GNUC_INTERNAL GtkWidget * v3270_dialog_create_grid(GtkAlign align); 54 G_GNUC_INTERNAL GtkWidget * v3270_dialog_create_grid(GtkAlign align);
55 G_GNUC_INTERNAL GtkWidget * v3270_dialog_create_frame(GtkWidget * child, const gchar *title); 55 G_GNUC_INTERNAL GtkWidget * v3270_dialog_create_frame(GtkWidget * child, const gchar *title);
  56 +
  57 +#if ! GTK_CHECK_VERSION(3,12,0)
  58 + #define GtkHeaderBar GtkWidget
  59 +#endif // ! GTK 3.12
  60 +
56 G_GNUC_INTERNAL GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget); 61 G_GNUC_INTERNAL GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget);
57 62
58 // Activity list widget. 63 // Activity list widget.