--- a/dwt/internal/cocoa/NSMapTable.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSMapTable.d	Tue Aug 19 17:35:17 2008 +0200
@@ -37,37 +37,37 @@
 
     public NSUInteger count ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_count);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_count);
     }
 
     public NSDictionary dictionaryRepresentation ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_dictionaryRepresentation);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_dictionaryRepresentation);
         return result !is null ? new NSDictionary(result) : null;
     }
 
     public id initWithKeyOptions (NSPointerFunctionsOptions keyOptions, NSPointerFunctionsOptions valueOptions, NSUInteger initialCapacity)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithKeyOptions_1valueOptions_1capacity_1, keyOptions, valueOptions, initialCapacity);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithKeyOptions_1valueOptions_1capacity_1, keyOptions, valueOptions, initialCapacity);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithKeyPointerFunctions (NSPointerFunctions keyFunctions, NSPointerFunctions valueFunctions, NSUInteger initialCapacity)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithKeyPointerFunctions_1valuePointerFunctions_1capacity_1,
-                keyFunctions !is null ? keyFunctions.id : null, valueFunctions !is null ? valueFunctions.id : null, initialCapacity);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithKeyPointerFunctions_1valuePointerFunctions_1capacity_1,
+                keyFunctions !is null ? keyFunctions.id_ : null, valueFunctions !is null ? valueFunctions.id_ : null, initialCapacity);
         return result !is null ? new id(result) : null;
     }
 
     public NSEnumerator keyEnumerator ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_keyEnumerator);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_keyEnumerator);
         return result !is null ? new NSEnumerator(result) : null;
     }
 
     public NSPointerFunctions keyPointerFunctions ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_keyPointerFunctions);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_keyPointerFunctions);
         return result !is null ? new NSPointerFunctions(result) : null;
     }
 
@@ -103,34 +103,34 @@
 
     public NSEnumerator objectEnumerator ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_objectEnumerator);
         return result !is null ? new NSEnumerator(result) : null;
     }
 
     public id objectForKey (id aKey)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_objectForKey_1, aKey !is null ? aKey.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_objectForKey_1, aKey !is null ? aKey.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public void removeAllObjects ()
     {
-        OS.objc_msgSend(this.id, OS.sel_removeAllObjects);
+        OS.objc_msgSend(this.id_, OS.sel_removeAllObjects);
     }
 
     public void removeObjectForKey (id aKey)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeObjectForKey_1, aKey !is null ? aKey.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_removeObjectForKey_1, aKey !is null ? aKey.id_ : null);
     }
 
     public void setObject (id anObject, id aKey)
     {
-        OS.objc_msgSend(this.id, OS.sel_setObject_1forKey_1, anObject !is null ? anObject.id : null, aKey !is null ? aKey.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setObject_1forKey_1, anObject !is null ? anObject.id_ : null, aKey !is null ? aKey.id_ : null);
     }
 
     public NSPointerFunctions valuePointerFunctions ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_valuePointerFunctions);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_valuePointerFunctions);
         return result !is null ? new NSPointerFunctions(result) : null;
     }