Loading the palette fails due to an undefined symbol as it was still
linking with the old EOModeler library.  This change doesn't make the
palette useful but at least avoids an exception.
---
 GDL2Palette/GNUmakefile       | 2 +-
 GDL2Palette/ResourceManager.m | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/GDL2Palette/GNUmakefile b/GDL2Palette/GNUmakefile
index 7e86a30..15a0e37 100644
--- a/GDL2Palette/GNUmakefile
+++ b/GDL2Palette/GNUmakefile
@@ -31,7 +31,7 @@ PALETTE_NAME=GDL2
 GDL2_NEEDS_GUI = yes
 GDL2_PRINCIPAL_CLASS = GDL2Palette
 
-ADDITIONAL_INCLUDE_DIRS+=-I../
+ADDITIONAL_INCLUDE_DIRS+=-I../Apps/EOModeler -I../
 ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface 
../Apps/EOModeler
 ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl EOInterface EOModeler 
 
diff --git a/GDL2Palette/ResourceManager.m b/GDL2Palette/ResourceManager.m
index 71c5f34..b57753b 100644
--- a/GDL2Palette/ResourceManager.m
+++ b/GDL2Palette/ResourceManager.m
@@ -29,7 +29,6 @@
 #include <EOInterface/EODisplayGroup.h>
 #include <EOInterface/EOMasterDetailAssociation.h>
 
-#include <EOModeler/EOModelerApp.h>
 #include <GormCore/GormDocument.h>
 
 #include <EOAccess/EOModelGroup.h>
@@ -43,6 +42,8 @@
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSNotification.h>
 
+static NSString *EOMPropertyPboardType = @"EOModelProperty";
+
 @implementation GDL2ResourceManager
 - (id) initWithDocument:(id<IBDocuments>)doc
 {
-- 
2.55.0


Reply via email to