--- a/dwt/internal/objc/runtime.d	Fri Aug 22 16:46:34 2008 +0200
+++ b/dwt/internal/objc/runtime.d	Sat Aug 23 13:49:00 2008 +0200
@@ -9,7 +9,7 @@
 
 import tango.stdc.stringz : fromStringz, toStringz;
 
-import dwt.dwthelper.utils : string;
+import dwt.dwthelper.utils : String;
 import dwt.internal.cocoa.NSPoint;
 import dwt.internal.cocoa.NSRange;
 import dwt.internal.cocoa.NSSize;
@@ -36,6 +36,9 @@
 {
     id receiver;
     Class clazz;
+    
+    /// for dwt compatibility
+    alias clazz cls;
 }
 
 struct objc_class
@@ -111,76 +114,76 @@
 
 alias dwt.internal.objc.bindings.objc_registerClassPair objc_registerClassPair;
 
-bool class_addIvar (Class cls, string name, size_t size, byte alignment, string types)
+bool class_addIvar (Class cls, String name, size_t size, byte alignment, String types)
 {
     return dwt.internal.objc.bindings.class_addIvar(cls, name.ptr, size, alignment, types.ptr);
 }
 
-bool class_addMethod (Class cls, SEL name, IMP imp, string types)
+bool class_addMethod (Class cls, SEL name, IMP imp, String types)
 {
     return dwt.internal.objc.bindings.class_addMethod(cls, name, imp, types.ptr);
 }
 
-Class objc_allocateClassPair (Class superclass, string name, size_t extraBytes)
+Class objc_allocateClassPair (Class superclass, String name, size_t extraBytes)
 {
     return dwt.internal.objc.bindings.objc_allocateClassPair(superclass, name.ptr, extraBytes);
 }
 
-id objc_getClass (string name)
+id objc_getClass (String name)
 {
     return dwt.internal.objc.bindings.objc_getClass(name.ptr);
 }
 
-id objc_lookUpClass (string name)
+id objc_lookUpClass (String name)
 {
     return dwt.internal.objc.bindings.objc_lookUpClass(name.ptr);
 }
 
-string object_getClassName (id obj)
+String object_getClassName (id obj)
 {
     return fromStringz(dwt.internal.objc.bindings.object_getClassName(obj));
 }
 
-Ivar object_getInstanceVariable (id obj, string name, void** outValue)
+Ivar object_getInstanceVariable (id obj, String name, void** outValue)
 {
     return dwt.internal.objc.bindings.object_getInstanceVariable(obj, name.ptr, outValue);
 }
 
-Ivar object_setInstanceVariable (id obj, string name, void* value)
+Ivar object_setInstanceVariable (id obj, String name, void* value)
 {
     return dwt.internal.objc.bindings.object_setInstanceVariable(obj, name.ptr, value);
 }
 
-string sel_registerName (string str)
+String sel_registerName (String str)
 {
     return fromStringz(dwt.internal.objc.bindings.sel_registerName(str.ptr));
 }
 
-id objc_msgSend (ARGS...)(id theReceiver, string theSelector, ARGS args)
+id objc_msgSend (ARGS...)(id theReceiver, String theSelector, ARGS args)
 {
     return dwt.internal.objc.bindings.objc_msgSend(theReceiver, theSelector.ptr, args);
 }
 
 /// dummy function for now
-int objc_msgSend_struct (T, ARGS...)(T* result, id theReceiver, string theSelector, ARGS args)
+int objc_msgSend_struct (T, ARGS...)(T* result, id theReceiver, String theSelector, ARGS args)
 {
     //result = *cast(T) dwt.internal.objc.bindings.objc_msgSend(theReceiver, theSelector.ptr, args);
     return 0;
 }
 
-void objc_msgSend_stret (T, ARGS...)(T* stretAddr, id theReceiver, string theSelector, ARGS args)
+void objc_msgSend_stret (T, ARGS...)(T* stretAddr, id theReceiver, String theSelector, ARGS args)
 {
     dwt.internal.objc.bindings.objc_msgSend_stret(stretAddr, theReceiver, theSelector.ptr, args);
 }
 
-id objc_msgSendSuper (ARGS...)(objc_super* superr, string op, ARGS args)
+id objc_msgSendSuper (ARGS...)(objc_super* superr, String op, ARGS args)
 {
     return dwt.internal.objc.bindings.objc_msgSendSuper(superr, op.ptr, args);
 }
 
 version (X86)
 {
-    double objc_msgSend_fpret(ARGS...)(id self, string op, ARGS args)
+    double objc_msgSend_fpret(ARGS...)(id self, String op, ARGS args)
     {
         return dwt.internal.objc.bindings.objc_msgSend_fpret(self, op.ptr, args);
     }