Fix problem building under Gtk+2.18

diff --git a/lib/gtk-contrib/automake.mk b/lib/gtk-contrib/automake.mk
index b39bdb38786fe7d4f06ba4131a61427efb8fed0d..e694d714cdb345b445dfb49978e26b1f4bccdf93 100644 (file)
--- 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 2167606c0768995a94483d917789c421048f4fab..19621c39ff56a377ee5313fee9ad82ebcbb6bfbc 100644 (file)
--- 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
 {