~hww3/pike_modules-public_objectivec commit

4 files changed, 12 insertions(+), 10 deletions(-)

M ObjC.mmod
M PiObjCObject.m
M dynamic_class.m
M util.h

M ObjC.mmod +6 -6

@@ 29,9 29,9 @@ void pike_init_piobjc_appkit();
 void pike_exit_piobjc_appkit();
 void pike_exit_piobjc_foundation();
 
-object_setInstanceVariableProc old_object_setInstanceVariable = NULL;
-object_getInstanceVariableProc old_object_getInstanceVariable = NULL;
-objc_getClassProc old_objc_getClass = NULL;
+//object_setInstanceVariableProc old_object_setInstanceVariable = NULL;
+//object_getInstanceVariableProc old_object_getInstanceVariable = NULL;
+//objc_getClassProc old_objc_getClass = NULL;
 
 static CFRunLoopTimerRef		gTimerRef;
 static int backend_callback_set = 0;

          
@@ 431,9 431,9 @@ INIT
  add_ref(global_classname_cache);
  add_ref(global_mixin_dict);
 
- override_objc_getClass();
- override_object_setInstanceVariable();
- override_object_getInstanceVariable();
+ //override_objc_getClass();
+ //override_object_setInstanceVariable();
+ //override_object_getInstanceVariable();
 
  start_mixins();

M PiObjCObject.m +3 -3

@@ 533,10 533,10 @@ void instantiate_pike_native_class(struc
 //	pobject = Pike_sp[-1].u.object;
   add_ref(pobject);
   add_ref(prog);
- LOG("* setting the object's instance variable: %p, %p, %p\n", obj, pobject, old_object_setInstanceVariable);
-//	object_setInstanceVariable(obj, "pobject",  pobject);
+// LOG("* setting the object's instance variable: %p, %p, %p\n", obj, pobject, old_object_setInstanceVariable);
+	object_setInstanceVariable(obj, "pobject",  pobject);
 
-	old_object_setInstanceVariable(obj, "pobject",  pobject);
+//	old_object_setInstanceVariable(obj, "pobject",  pobject);
 	  PiObjC_RegisterObjCProxy(pobject, obj);
 // LOG("done\n");
 }

M dynamic_class.m +2 -1

@@ 744,7 744,8 @@ void f_objc_dynamic_setter(char * vn, IN
   var = svalue_to_ptr(var, ivar_getTypeEncoding(vardef));
   pop_n_elems(args);
   
-  old_object_setInstanceVariable(THIS->obj, vn, var);
+  //old_object_setInstanceVariable(THIS->obj, vn, var);
+ object_setInstanceVariable(THIS->obj, vn, var);
 }
 
 void objc_dynamic_class_init()

M util.h +1 -0

@@ 30,6 30,7 @@ 
 #endif
 
 #define DEBUG 1 
+//#undef DEBUG 
 
 #define LOG(fmt, ...) \
             do { if (DEBUG) fprintf(stderr, fmt, __VA_ARGS__); } while (0)