LinGui: fix backward compatibility issue

Versions of gdk on Ubuntu 9.10 and 10.04 do not have GDK_KEY_* macros

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3871 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index c52b2cd1465a83551e8ed01dc4f06994af1e79ad..d44960a041c2340e20deee7aeba1693a5d8ea9c0 100644 (file)
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -11,7 +11,7 @@
  * any later version.
  */
 
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include "hb.h"
 #include "settings.h"
 #include "hb-backend.h"

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 9bc2dd7ccab5585648e8097673aa8c11a1d54c73..aead002b3d830f7d191552d3e55b1089db5d7a90 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -30,6 +30,8 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
+#include "ghbcompat.h"
+
 #if !defined(_NO_UPDATE_CHECK)
 #if defined(_OLD_WEBKIT)
 #include <webkit.h>
@@ -50,8 +52,6 @@
 #include <dbt.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 

diff --git a/gtk/src/ghbcellrenderertext.c b/gtk/src/ghbcellrenderertext.c
index abaf9694ce43a1428b1d9d067f94db4830bf3138..6f6329057b8f849e106183d41600a3993a573ccc 100644 (file)
--- a/gtk/src/ghbcellrenderertext.c
+++ b/gtk/src/ghbcellrenderertext.c
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include <glib/gi18n-lib.h>
 #include <gtk/gtkmarshal.h>
 //#include <gtk/gtkeditable.h>

diff --git a/gtk/src/ghbcompat.h b/gtk/src/ghbcompat.h
new file mode 100644 (file)
index 0000000..911f132
--- /dev/null
+++ b/gtk/src/ghbcompat.h
@@ -0,0 +1,19 @@
+#if !defined(_GHB_COMPAT_H_)
+#define _GHB_COMPAT_H_
+
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+
+#if !GTK_CHECK_VERSION(3, 0, 0)
+#include <gdk/gdkkeysyms.h>
+#endif
+
+// Define any keys not defined by older GDK versions
+#if !defined(GDK_KEY_Delete)
+#define GDK_KEY_Delete GDK_Delete
+#define GDK_KEY_Return GDK_Return
+#define GDK_KEY_Down GDK_Down
+#define GDK_KEY_Up GDK_Up
+#endif
+
+#endif // _GHB_COMPAT_H_

diff --git a/gtk/src/ghbcompositor.c b/gtk/src/ghbcompositor.c
index eb46cde50bc4bfd65936aea2db785d25b872a25c..c67181ebfc4150c3492bac73f028d128028bad34 100644 (file)
--- a/gtk/src/ghbcompositor.c
+++ b/gtk/src/ghbcompositor.c
@@ -27,7 +27,7 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include <gtk/gtkprivate.h>
 #include <gtk/gtkmarshal.h>
 #include "ghbcompositor.h"

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 17f0af853ac01089a0a861f4f42e83b5a5b2f376..e0ee19c3b5125d6f1acc9a583617a3dd1b461aea 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -25,7 +25,7 @@
 #include <limits.h>
 #include <math.h>
 #include "hb.h"
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include <glib/gstdio.h>
 #include "hb-backend.h"
 #include "settings.h"

diff --git a/gtk/src/icons.c b/gtk/src/icons.c
index 9054976310ebd0a56cf6eef3cdadd080ef8641af..2fec1540e440faa3d21dca12cb9ded69d5171c29 100644 (file)
--- a/gtk/src/icons.c
+++ b/gtk/src/icons.c
@@ -1,4 +1,4 @@
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include "icon_tools.h"
 #include "values.h"
 #include "resources.h"

diff --git a/gtk/src/main.c b/gtk/src/main.c
index f55abd3482ae429e36a89f6181a106696cdbcd63..176f0f489a44094d97fa980a58b2a540fe472de0 100644 (file)
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -32,7 +32,7 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 
 #if defined(_ENABLE_GST)
 #include <gst/gst.h>

diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 4d7217f8ac1382903634fc620d3176f2ecc124d5..b3815f0326faafc501e47d20cb31b6d42cd68a2a 100644 (file)
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -19,7 +19,7 @@
 #include <glib-object.h>
 #include <glib/gstdio.h>
 #include <string.h>
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include "hb.h"
 #include "settings.h"
 #include "callbacks.h"

diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 1023ade6d5ffec0a888e516fda3be374cd282da0..e4381d0368ee8f2db6580184620f0b9431274d05 100644 (file)
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -15,7 +15,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glib-object.h>
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 
 #if !defined(_WIN32)
 #include <gdk/gdkx.h>

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index dfa0e173887a089bccd7981b2740a3b18feb9752..7fd6a82dab65e0a39320c3f5d3df37808a574ec8 100644 (file)
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -11,8 +11,7 @@
  * any later version.
  */
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
+#include "ghbcompat.h"
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 #include "hb.h"

diff --git a/gtk/src/resources.c b/gtk/src/resources.c
index e4252140ff39ad9ae6ee447ed8d792d6052a14e2..c2255013f6eb4e43cd643e96b7d4da3e74219173 100644 (file)
--- a/gtk/src/resources.c
+++ b/gtk/src/resources.c
@@ -15,7 +15,7 @@
 #include <glib-object.h>
 #include <glib/gstdio.h>
 #include <string.h>
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include "settings.h"
 #include "plist.h"
 #include "resources.h"

diff --git a/gtk/src/settings.c b/gtk/src/settings.c
index 46e2de94177c7fc57923c8673cd0469924059934..2fe0b5e6ded6c35302794da8abd9127f11fcad81 100644 (file)
--- a/gtk/src/settings.c
+++ b/gtk/src/settings.c
@@ -16,7 +16,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include "settings.h"
 #include "hb-backend.h"
 #include "values.h"

diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
index 0746b2631309e2f68bc5eb30a4a0c3684522844d..14d3da0a0068612c27899a4f7124767a61ba8952 100644 (file)
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -11,7 +11,7 @@
  * any later version.
  */
 
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include "hb.h"
 #include "settings.h"
 #include "hb-backend.h"

diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index d7602f76863fa50fb3f195d8e98eb14142f191c9..86bdb4a119001107d0fd1d7c32a560a6c23ba0df 100644 (file)
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -11,7 +11,7 @@
  * any later version.
  */
 
-#include <gtk/gtk.h>
+#include "ghbcompat.h"
 #include <string.h>
 #include "settings.h"
 #include "values.h"