From dafa40f0e5cbd354409821b7cfee2f03d0139955 Mon Sep 17 00:00:00 2001
From: Dave Wetzel <dave@turbocat.de>
Date: Mon, 31 May 2010 03:40:11 +0000
Subject: [PATCH] make compile on Ubuntu

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30505 72102866-910b-0410-8b05-ffd578937521
---
 Apps/EOModelEditor/EOMEDocument.h                       | 2 +-
 Apps/EOModelEditor/GNUmakefile                          | 2 +-
 Apps/EOModelEditor/Inspectors/AdvancedEntityInspector.h | 4 ----
 Apps/EOModelEditor/TableViewController.h                | 5 ++++-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Apps/EOModelEditor/EOMEDocument.h b/Apps/EOModelEditor/EOMEDocument.h
index 1747abf..7ab1787 100644
--- a/Apps/EOModelEditor/EOMEDocument.h
+++ b/Apps/EOModelEditor/EOMEDocument.h
@@ -28,7 +28,7 @@
 #ifndef __EOMEDocument_h
 #define __EOMEDocument_h
 
-#include <AppKit/NSDocument.h>
+#include <AppKit/AppKit.h>
 #include <Renaissance/Renaissance.h>
 #include <EOAccess/EOModel.h>
 #include <EOModeler/EODefines.h>
diff --git a/Apps/EOModelEditor/GNUmakefile b/Apps/EOModelEditor/GNUmakefile
index e1a8ec0..fb58ec8 100644
--- a/Apps/EOModelEditor/GNUmakefile
+++ b/Apps/EOModelEditor/GNUmakefile
@@ -39,7 +39,7 @@ endif
 
 ADDITIONAL_INCLUDE_DIRS+=-I../
 ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler
-ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOInterface EOModeler Renaissance
+ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOModeler Renaissance
 
 $(APP_NAME)_RESOURCE_FILES =			\
 	Resources/ModelDrag.tiff		\
diff --git a/Apps/EOModelEditor/Inspectors/AdvancedEntityInspector.h b/Apps/EOModelEditor/Inspectors/AdvancedEntityInspector.h
index 1c07f60..822228a 100644
--- a/Apps/EOModelEditor/Inspectors/AdvancedEntityInspector.h
+++ b/Apps/EOModelEditor/Inspectors/AdvancedEntityInspector.h
@@ -21,11 +21,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef NeXT_GUI_LIBRARY
 #include <AppKit/AppKit.h>
-#else
-#include <AppKit/NSNibDeclarations.h>
-#endif
 
 #include <EOModeler/EOMInspector.h>
 
diff --git a/Apps/EOModelEditor/TableViewController.h b/Apps/EOModelEditor/TableViewController.h
index 4157c48..10823fc 100644
--- a/Apps/EOModelEditor/TableViewController.h
+++ b/Apps/EOModelEditor/TableViewController.h
@@ -34,7 +34,10 @@
 
 #define TableViewDataHasChangedNotification @"TableViewDataHasChangedNotification"
 
-@interface TableViewController : NSViewController <NSTableViewDataSource, NSTableViewDelegate>
+@interface TableViewController : NSViewController 
+#ifndef GNUSTEP
+<NSTableViewDataSource, NSTableViewDelegate>
+#endif
 {
   NSMutableSet         *_boolColumnNames;
   NSTableView          *_tableView; // not retained