--- a/dwt/internal/cocoa/NSCharacterSet.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSCharacterSet.d	Tue Aug 19 17:35:17 2008 +0200
@@ -42,7 +42,7 @@
 
     public NSData bitmapRepresentation ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_bitmapRepresentation);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_bitmapRepresentation);
         return result !is null ? new NSData(result) : null;
     }
 
@@ -54,24 +54,24 @@
 
     public bool characterIsMember (short aCharacter)
     {
-        return OS.objc_msgSend(this.id, OS.sel_characterIsMember_1, aCharacter) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_characterIsMember_1, aCharacter) !is null;
     }
 
     public static id characterSetWithBitmapRepresentation (NSData data)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithBitmapRepresentation_1, data !is null ? data.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithBitmapRepresentation_1, data !is null ? data.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id characterSetWithCharactersInString (NSString aString)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithCharactersInString_1, aString !is null ? aString.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithCharactersInString_1, aString !is null ? aString.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public static id characterSetWithContentsOfFile (NSString fName)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithContentsOfFile_1, fName !is null ? fName.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_characterSetWithContentsOfFile_1, fName !is null ? fName.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
@@ -101,7 +101,7 @@
 
     public bool hasMemberInPlane (byte thePlane)
     {
-        return OS.objc_msgSend(this.id, OS.sel_hasMemberInPlane_1, thePlane) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_hasMemberInPlane_1, thePlane) !is null;
     }
 
     public static id illegalCharacterSet ()
@@ -112,13 +112,13 @@
 
     public NSCharacterSet invertedSet ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_invertedSet);
-        return result is this.id ? this : (result !is null ? new NSCharacterSet(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_invertedSet);
+        return result is this.id_ ? this : (result !is null ? new NSCharacterSet(result) : null);
     }
 
     public bool isSupersetOfSet (NSCharacterSet theOtherSet)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isSupersetOfSet_1, theOtherSet !is null ? theOtherSet.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isSupersetOfSet_1, theOtherSet !is null ? theOtherSet.id_ : null) !is null;
     }
 
     public static id letterCharacterSet ()
@@ -129,7 +129,7 @@
 
     public bool longCharacterIsMember (dchar theLongChar)
     {
-        return OS.objc_msgSend(this.id, OS.sel_longCharacterIsMember_1, theLongChar) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_longCharacterIsMember_1, theLongChar) !is null;
     }
 
     public static id lowercaseLetterCharacterSet ()