[Xfce4-commits] [apps/mousepad] 03/10: Use gdkkeysyms-compat.h on GTK3

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

mbrush pushed a commit to branch master
in repository apps/mousepad.

commit 061e120dac780455a636d3f04e102d15be978715
Author: Matthew Brush <mbrush at codebrainz.ca>
Date:   Wed Jul 16 01:02:54 2014 -0700

    Use gdkkeysyms-compat.h on GTK3
---
 mousepad/mousepad-gtkcompat.h  |   10 ++++++++++
 mousepad/mousepad-search-bar.c |    2 +-
 mousepad/mousepad-view.c       |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mousepad/mousepad-gtkcompat.h b/mousepad/mousepad-gtkcompat.h
index 1f5c0e6..3de0870 100644
--- a/mousepad/mousepad-gtkcompat.h
+++ b/mousepad/mousepad-gtkcompat.h
@@ -3,6 +3,14 @@
 
 #include <gtk/gtk.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+# include <gdk/gdkkeysyms-compat.h>
+#else
+# include <gdk/gdkkeysyms.h>
+#endif
+
+G_BEGIN_DECLS
+
 #if ! GTK_CHECK_VERSION(2, 24, 0)
 # define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text
 # define gtk_combo_box_text_new            gtk_combo_box_new_text
@@ -27,4 +35,6 @@ gtk_widget_get_allocated_height (GtkWidget *widget)
 }
 #endif
 
+G_END_DECLS
+
 #endif /* __MOUSEPAD_GTK_COMPAT_H__ */
diff --git a/mousepad/mousepad-search-bar.c b/mousepad/mousepad-search-bar.c
index 7c091ac..c3073f4 100644
--- a/mousepad/mousepad-search-bar.c
+++ b/mousepad/mousepad-search-bar.c
@@ -15,6 +15,7 @@
  */
 
 #include <mousepad/mousepad-private.h>
+#include <mousepad/mousepad-gtkcompat.h>
 #include <mousepad/mousepad-settings.h>
 #include <mousepad/mousepad-marshal.h>
 #include <mousepad/mousepad-document.h>
@@ -23,7 +24,6 @@
 #include <mousepad/mousepad-window.h>
 
 #include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
 
 
 
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index 47e7e98..ca33767 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -15,11 +15,11 @@
  */
 
 #include <mousepad/mousepad-private.h>
+#include <mousepad/mousepad-gtkcompat.h>
 #include <mousepad/mousepad-settings.h>
 #include <mousepad/mousepad-util.h>
 #include <mousepad/mousepad-view.h>
 
-#include <gdk/gdkkeysyms.h>
 #include <gtksourceview/gtksourceview.h>
 #include <gtksourceview/gtksourcestylescheme.h>
 #include <gtksourceview/gtksourcestyleschememanager.h>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.