update for new objc runtime

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@29958 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,12 @@
+2010-03-15  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* EOControl/EONSAddOns.h:
+	* EOControl/EONSAddOns.m:
+	* EOControl/EOKeyValueCoding.m:
+	* EOControl/EOClassDescription.m:
+	Rewrite mechanism to try to ensure that our implementations are used
+	for KVC.  New version should work with the objc runtime API.
+	
 2010-03-07  Matt Rice  <ratmice@gmail.com>
 
 	* DBModeler/DiagramView.m: Add missing include.

EOControl/EOClassDescription.m

@@ -739,17 +739,13 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
 
 @end
 
-
+@interface GDL2CDNSObject : NSObject
-@implementation NSObject (EOClassDescriptionPrimitives)
+@end
-
+@implementation GDL2CDNSObject
-- (void)GDL2CDNSObjectICategoryID
-{
-}
 
 + (void)load
 {
-  GDL2_ActivateCategory("NSObject",
+  GDL2_Activate([self class], YES);
-                        @selector(GDL2CDNSObjectICategoryID), YES);
 }
 
 // when you enable the NSDebugMLLogs here you will have a loop. dave

EOControl/EOKeyValueCoding.m

@@ -92,16 +92,13 @@ initialize(void)
 #define INITIALIZE if (!initialized) initialize();
 
 
-@implementation NSObject (_EOKeyValueCodingCompatibility)
+@interface	GDL2KVCNSObject : NSObject
-
+@end
-- (void)GDL2KVCNSObjectICategoryID
+@implementation GDL2KVCNSObject
-{
-}
 
 + (void)load
 {
-  GDL2_ActivateCategory("NSObject",
+  GDL2_Activate([self class], YES);
-			@selector(GDL2KVCNSObjectICategoryID), YES);
 }
 
 
@@ -235,16 +232,13 @@ initialize(void)
 @end
 
 
-@implementation NSArray (EOKeyValueCoding)
+@interface	GDL2KVCNSArray : NSArray
-
+@end
-- (void)GDL2KVCNSArrayICategoryID
+@implementation	GDL2KVCNSArray
-{
-}
 
 + (void)load
 {
-  GDL2_ActivateCategory("NSArray",
+  GDL2_Activate([self class], YES);
-			@selector(GDL2KVCNSArrayICategoryID), YES);
 }
 
 /**
@@ -543,16 +537,14 @@ initialize(void)
 @end
 
 
-@implementation NSDictionary (EOKeyValueCoding)
+@interface	GDL2KVCNSDictionary : NSDictionary
+@end
+@implementation	GDL2KVCNSDictionary
 
-- (void)GDL2KVCNSDictionaryICategoryID
-{
-}
 
 + (void)load
 {
-  GDL2_ActivateCategory("NSDictionary",
+  GDL2_Activate([self class], YES);
-			@selector(GDL2KVCNSDictionaryICategoryID), YES);
 }
 
 /**
@@ -851,16 +843,13 @@ initialize(void)
           isSmart: (BOOL)smartFlag;
 @end
 
-@implementation NSMutableDictionary (EOKVCGNUstepExtensions)
+@interface	GDL2KVCNSMutableDictionary : NSMutableDictionary
-
+@end
-- (void)GDL2KVCNSMutableDictionaryICategoryID
+@implementation GDL2KVCNSMutableDictionary
-{
-}
 
 + (void)load
 {
-  GDL2_ActivateCategory("NSMutableDictionary",
+  GDL2_Activate([self class], YES);
-			@selector(GDL2KVCNSMutableDictionaryICategoryID), YES);
 }
 
 /**

EOControl/EONSAddOns.h

@@ -51,7 +51,7 @@ GDL2CONTROL_EXPORT BOOL
 GSUseStrictWO451Compatibility(NSString *key);
 
 GDL2CONTROL_EXPORT void
-GDL2_ActivateCategory(const char *className, SEL sel, BOOL isInstance);
+GDL2_Activate(Class cls, BOOL isInstance);
 
 GDL2CONTROL_EXPORT void
 GDL2_ActivateAllGDL2Categories(void);

EOControl/EONSAddOns.m

@@ -64,6 +64,11 @@ RCS_ID("$Id$")
 
 #include "EOPrivate.h"
 
+@class GDL2KVCNSObject;
+@class GDL2KVCNSArray;
+@class GDL2KVCNSDictionary;
+@class GDL2KVCNSMutableDictionary;
+@class GDL2CDNSObject;
 
 static NSRecursiveLock *local_lock = nil;
 static BOOL GSStrictWO451Flag = NO;
@@ -98,6 +103,7 @@ GSUseStrictWO451Compatibility (NSString *key)
 void
 GDL2_DumpMethodList(Class cls, SEL sel, BOOL isInstance)
 {
+/*
   void *iterator = 0;
   GSMethodList mList;
   
@@ -113,39 +119,30 @@ GDL2_DumpMethodList(Class cls, SEL sel, BOOL isInstance)
 	      mList, meth, imp);
     }
   fprintf(stderr,"List finished\n"); fflush(stderr);
+*/
 }
 
 void
-GDL2_ActivateCategory(const char *className, SEL sel, BOOL isInstance)
+GDL2_Activate(Class cls, BOOL isInstance)
 {
-  Class cls;
+  if (NO == isInstance)
-  GSMethodList mList;
+    {
-
+      cls = object_getClass(cls);
-  cls = GSClassFromName(className);
+    }
-  mList = GSMethodListForSelector(cls, sel, 0, isInstance);
+  GSObjCAddClassOverride([cls superclass], cls);
-
-  GSRemoveMethodList(cls, mList, isInstance);
-  GSAddMethodList(cls, mList, isInstance);
-
-  GSFlushMethodCacheForClass(cls);
 }
 
 void
 GDL2_ActivateAllGDL2Categories(void)
 {
   /* EOKeyValueCoding */
-  GDL2_ActivateCategory("NSObject",
+  GDL2_Activate([GDL2KVCNSObject class], YES);
-                        @selector(GDL2KVCNSObjectICategoryID), YES);
+  GDL2_Activate([GDL2KVCNSArray class], YES);
-  GDL2_ActivateCategory("NSArray",
+  GDL2_Activate([GDL2KVCNSDictionary class], YES);
-			@selector(GDL2KVCNSArrayICategoryID), YES);
+  GDL2_Activate([GDL2KVCNSMutableDictionary class], YES);
-  GDL2_ActivateCategory("NSDictionary",
-                        @selector(GDL2KVCNSDictionaryICategoryID), YES);
-  GDL2_ActivateCategory("NSMutableDictionary",
-                        @selector(GDL2KVCNSMutableDictionaryICategoryID), YES);
 
   /* EOClassDescription */
-  GDL2_ActivateCategory("NSObject",
+  GDL2_Activate([GDL2CDNSObject class], YES);
-                        @selector(GDL2CDNSObjectICategoryID), YES);
 
 }