From ae98fbe8c81712746073d10e328b02bfb454fda8 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Thu, 9 Apr 2015 11:41:06 +0100
Subject: Only define compatability helpers for sexy icons if required.

The helper nsgtk_widget_get_state is only necessary for sexy icons and
introduces unecessary GTK 3 compatability issues otehrwise.
---
 gtk/compat.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'gtk/compat.c')

diff --git a/gtk/compat.c b/gtk/compat.c
index 0dea5aa31..c41a05e9c 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -25,8 +25,24 @@
 
 #include "gtk/compat.h"
 
-#if !GTK_CHECK_VERSION(2,16,0)
+#ifdef _SEXY_ICON_ENTRY_H_
 #include "gtk/sexy_icon_entry.c"
+
+/*
+ * exported interface documented in gtk/compat.h
+ *
+ * Only required for the lib sexy interface before 2.16
+ */
+GtkStateType nsgtk_widget_get_state(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+	return gtk_widget_get_state(widget);
+#else
+	return GTK_WIDGET_STATE(widget);
+#endif
+}
+
+
 #endif
 
 void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
@@ -86,15 +102,6 @@ gboolean nsgtk_widget_is_drawable(GtkWidget *widget)
 #endif
 }
 
-GtkStateType nsgtk_widget_get_state(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
-	return gtk_widget_get_state(widget);
-#else
-	return GTK_WIDGET_STATE(widget);
-#endif
-}
-
 void nsgtk_dialog_set_has_separator(GtkDialog *dialog, gboolean setting)
 {
 #if GTK_CHECK_VERSION(2,21,8)
-- 
cgit v1.2.3