summaryrefslogtreecommitdiff
path: root/frontends/gtk
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2019-05-05 15:38:19 +0100
committerVincent Sanders <vince@kyllikki.org>2019-05-05 15:38:19 +0100
commitefdea7757b3bbdb4e092844b30be091d066cfe79 (patch)
tree7fee20ef5156f6f8af7b9671fbbd2a569d294d77 /frontends/gtk
parent9a3b644bf01f746d8e0c57706277ab0bd4ec8002 (diff)
downloadnetsurf-efdea7757b3bbdb4e092844b30be091d066cfe79.tar.gz
netsurf-efdea7757b3bbdb4e092844b30be091d066cfe79.tar.bz2
fix enum name incompatability between gtk 2 and 3
Diffstat (limited to 'frontends/gtk')
-rw-r--r--frontends/gtk/compat.h3
-rw-r--r--frontends/gtk/toolbar.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/frontends/gtk/compat.h b/frontends/gtk/compat.h
index 2276229c1..20a75a3f0 100644
--- a/frontends/gtk/compat.h
+++ b/frontends/gtk/compat.h
@@ -159,6 +159,9 @@ GtkStateType nsgtk_widget_get_state(GtkWidget *widget);
typedef GtkStateType GtkStateFlags;
typedef GtkStyle GtkStyleContext;
+/* gtk 3 changed the enum name for the state flags */
+#define GTK_STATE_FLAG_NORMAL GTK_STATE_NORMAL
+
#if GTK_CHECK_VERSION(2,22,0)
enum {
GTK_IN_DESTRUCTION = 1 << 0,
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index e93bd49f9..d5510f41e 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -786,7 +786,10 @@ static void nsgtk_toolbar_close(struct nsgtk_scaffolding *g)
gtk_widget_show_all(GTK_WIDGET(nsgtk_scaffolding_toolbar(
list)));
nsgtk_scaffolding_set_sensitivity(list);
- nsgtk_widget_override_background_color(GTK_WIDGET(nsgtk_window_get_layout(nsgtk_scaffolding_top_level(list))), GTK_STATE_NORMAL, 0, 0xFFFF, 0xFFFF, 0xFFFF);
+ nsgtk_widget_override_background_color(
+ GTK_WIDGET(nsgtk_window_get_layout(nsgtk_scaffolding_top_level(list))),
+ GTK_STATE_FLAG_NORMAL,
+ 0, 0xFFFF, 0xFFFF, 0xFFFF);
g_signal_handler_unblock(GTK_WIDGET(
nsgtk_window_get_layout(
nsgtk_scaffolding_top_level(list))),