From 52f7f6a6209fc610dece4f6a6c4f752f033e1121 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 23 Oct 2010 14:12:33 +0000 Subject: More GTK 2.22.0 support svn path=/trunk/netsurf/; revision=10897 --- gtk/gtk_compat.c | 12 ++++++++++++ gtk/gtk_compat.h | 1 + gtk/gtk_window.c | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) (limited to 'gtk') diff --git a/gtk/gtk_compat.c b/gtk/gtk_compat.c index 0beb7486f..f6ca5c3c4 100644 --- a/gtk/gtk_compat.c +++ b/gtk/gtk_compat.c @@ -22,6 +22,18 @@ #include "gtk/gtk_compat.h" +void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus) +{ + #if GTK_CHECK_VERSION(2,22,0) + gtk_widget_set_can_focus(widget, can_focus); + #else + if (can_focus == TRUE) + GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS); + else + GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS); + #endif +} + gboolean nsgtk_widget_has_focus(GtkWidget *widget) { #if GTK_CHECK_VERSION(2,20,0) diff --git a/gtk/gtk_compat.h b/gtk/gtk_compat.h index 367d3c522..489fa7ea1 100644 --- a/gtk/gtk_compat.h +++ b/gtk/gtk_compat.h @@ -25,6 +25,7 @@ #include +void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus); gboolean nsgtk_widget_has_focus(GtkWidget *widget); gboolean nsgtk_widget_get_visible(GtkWidget *widget); gboolean nsgtk_widget_get_realized(GtkWidget *widget); diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index 68e636b82..429ee01b4 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -27,6 +27,7 @@ #include "desktop/searchweb.h" #include "desktop/textinput.h" #include "desktop/selection.h" +#include "gtk/gtk_compat.h" #include "gtk/gtk_gui.h" #include "gtk/options.h" #include "gtk/gtk_scaffolding.h" @@ -302,7 +303,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(g->layout), GTK_CAN_FOCUS); + nsgtk_widget_set_can_focus(GTK_WIDGET(g->layout), TRUE); /* set the default background colour of the drawing area to white. */ gtk_widget_modify_bg(GTK_WIDGET(g->layout), GTK_STATE_NORMAL, -- cgit v1.2.3