--- a/dwt/internal/cocoa/NSFormatter.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSFormatter.d	Tue Aug 19 17:35:17 2008 +0200
@@ -18,6 +18,7 @@
 import dwt.internal.cocoa.NSDictionary;
 import dwt.internal.cocoa.NSObject;
 import dwt.internal.cocoa.NSRange;
+import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
@@ -36,39 +37,39 @@
 
     public NSAttributedString attributedStringForObjectValue (id obj, NSDictionary attrs)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_attributedStringForObjectValue_1withDefaultAttributes_1, obj !is null ? obj.id : null,
-                attrs !is null ? attrs.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_attributedStringForObjectValue_1withDefaultAttributes_1, obj !is null ? obj.id_ : null,
+                attrs !is null ? attrs.id_ : null);
         return result !is null ? new NSAttributedString(result) : null;
     }
 
     public NSString editingStringForObjectValue (id obj)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_editingStringForObjectValue_1, obj !is null ? obj.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_editingStringForObjectValue_1, obj !is null ? obj.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public bool getObjectValue (objc.id* obj, NSString str, objc.id** error)
     {
-        return OS.objc_msgSend(this.id, OS.sel_getObjectValue_1forString_1errorDescription_1, obj, str !is null ? str.id : null, error) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_getObjectValue_1forString_1errorDescription_1, obj, str !is null ? str.id_ : null, error) !is null;
     }
 
     public bool isPartialStringValid_newEditingString_errorDescription_ (NSString partialString, objc.id** newString, objc.id** error)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isPartialStringValid_1newEditingString_1errorDescription_1,
-                partialString !is null ? partialString.id : null, newString, error) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isPartialStringValid_1newEditingString_1errorDescription_1,
+                partialString !is null ? partialString.id_ : null, newString, error) !is null;
     }
 
     public bool isPartialStringValid_proposedSelectedRange_originalString_originalSelectedRange_errorDescription_ (objc.id** partialStringPtr,
             NSRangePointer proposedSelRangePtr, NSString origString, NSRange origSelRange, objc.id** error)
     {
-        return OS.objc_msgSend(this.id,
+        return OS.objc_msgSend(this.id_,
                 OS.sel_isPartialStringValid_1proposedSelectedRange_1originalString_1originalSelectedRange_1errorDescription_1, partialStringPtr,
-                proposedSelRangePtr, origString !is null ? origString.id : null, origSelRange, error) !is null;
+                proposedSelRangePtr, origString !is null ? origString.id_ : null, origSelRange, error) !is null;
     }
 
     public NSString stringForObjectValue (id obj)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_stringForObjectValue_1, obj !is null ? obj.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_stringForObjectValue_1, obj !is null ? obj.id_ : null);
         return result !is null ? new NSString(result) : null;
     }