about summary refs log tree commit diff stats
path: root/xombrero.h
diff options
context:
space:
mode:
authorJosh Rickmar <jrick@devio.us>2012-07-09 09:37:28 -0400
committerJosh Rickmar <jrick@devio.us>2012-07-09 09:37:28 -0400
commit1132d68aa111a6ae3eb3df093811791415f2bdcc (patch)
treeaab58b743d4cbd38edc8a717db48bdedab5f8e3b /xombrero.h
parentaf187aeb97e6d77ea4a044330b1205b12e59b2e6 (diff)
downloadxombrero-1132d68aa111a6ae3eb3df093811791415f2bdcc.tar.gz
Add for support for, and enable GTK3 as default.
GTK2 is still supported.  To build against GTK2, use:

$ GTK_VERSION=gtk2 make
Diffstat (limited to 'xombrero.h')
-rw-r--r--xombrero.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/xombrero.h b/xombrero.h
index 4dad29b..5ce02b9 100644
--- a/xombrero.h
+++ b/xombrero.h
@@ -66,6 +66,7 @@ uint32_t	arc4random_uniform(uint32_t);
 #include <sys/time.h>
 
 #include <gtk/gtk.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -201,7 +202,11 @@ struct tab {
 	GtkWidget		*label;
 	GtkWidget		*spinner;
 	GtkWidget		*uri_entry;
+#if GTK_CHECK_VERSION(3, 0, 0)
+	GtkStyleContext		*default_style;
+#else
 	GtkStyle		*default_style;
+#endif
 	GtkWidget		*search_entry;
 	GtkWidget		*toolbar;
 	GtkWidget		*browser_win;
@@ -369,6 +374,7 @@ RB_PROTOTYPE(http_accept_list, http_accept, entry, http_accept_rb_cmp);
 #define XT_CB_HANDLED		(TRUE)
 #define XT_CB_PASSTHROUGH	(FALSE)
 #define XT_CONF_FILE		("xombrero.conf")
+#define XT_CSS_FILE		("xombrero.css")
 #define XT_FAVS_FILE		("favorites")
 #define XT_SOD_FILE		("startofday")
 #define XT_RESERVED_CHARS	"$&+,/:;=?@ \"<>#%%{}|^~[]`"