From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 29 Jul 2011 14:12:38 +0000 (+0200)
Subject: Fix problem building under Gtk+2.18
X-Git-Tag: v0.7.9~180
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c164bdb08c957d54c0d8df988dd5ed518c9e5af;p=pspp-builds.git

Fix problem building under Gtk+2.18
---

diff --git a/lib/gtk-contrib/automake.mk b/lib/gtk-contrib/automake.mk
index b39bdb38..e694d714 100644
--- a/lib/gtk-contrib/automake.mk
+++ b/lib/gtk-contrib/automake.mk
@@ -2,6 +2,7 @@
 
 noinst_LIBRARIES += lib/gtk-contrib/libgtksheet.a
 
+lib_gtk_contrib_libgtksheet_a_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include
 lib_gtk_contrib_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
 lib_gtk_contrib_libgtksheet_a_SOURCES = \
diff --git a/lib/gtk-contrib/gtkxpaned.c b/lib/gtk-contrib/gtkxpaned.c
index 2167606c..19621c39 100644
--- a/lib/gtk-contrib/gtkxpaned.c
+++ b/lib/gtk-contrib/gtkxpaned.c
@@ -31,12 +31,11 @@
 
 #include <config.h>
 #include "gtkxpaned.h"
+
+#include <gtk/gtk.h>
 #include <ui/gui/psppire-marshal.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtksignal.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
+
 
 enum WidgetProperties
 {