aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-09-12 08:27:27 (EDT)
committerAlexander Kurtakov2012-10-01 17:08:20 (EDT)
commited548011f4f983818b96640d346d126775013185 (patch)
tree41e202d59fb79f487cb3b494a242634ecf4379ea
parentbbcd154d70095007816be6230c775a165b5caf29 (diff)
downloadeclipse.platform.swt-ed548011f4f983818b96640d346d126775013185.zip
eclipse.platform.swt-ed548011f4f983818b96640d346d126775013185.tar.gz
eclipse.platform.swt-ed548011f4f983818b96640d346d126775013185.tar.bz2
Include gtkx.h and gdkx.h for GTK 3.
GtkSocket and GtkPlug are no longer in gtk.h but in the X specific header gtkx.h for GTK 3. GDK X header is needed for the gdk_x11_* calls. Add the conditional includes to fix compilation for functions for this widgets.
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index 5462050..6cee2a9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -29,6 +29,10 @@
#include <stdlib.h>
#include <gtk/gtk.h>
#include <gdk/gdk.h>
+#if GTK_CHECK_VERSION(3,0,0)
+#include <gtk/gtkx.h>
+#include <gdk/gdkx.h>
+#endif
#include <pango/pango.h>
#include <pango/pango-font.h>
#include <string.h>