--- a/dwt/internal/cocoa/NSMutableAttributedString.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSMutableAttributedString.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSMutableAttributedString;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSAttributedString;
 import dwt.internal.cocoa.NSDictionary;
 import dwt.internal.cocoa.NSInteger;
@@ -37,68 +38,68 @@
 
     public void addAttribute (/*java int*/ /*objc NSString* */ NSString name, id value, NSRange range)
     {
-        OS.objc_msgSend(this.id, OS.sel_addAttribute_1value_1range_1, name !is null ? name.id : null, value !is null ? value.id : null, range);
+        OS.objc_msgSend(this.id_, OS.sel_addAttribute_1value_1range_1, name !is null ? name.id_ : null, value !is null ? value.id_ : null, range);
     }
 
     public void addAttributes (NSDictionary attrs, NSRange range)
     {
-        OS.objc_msgSend(this.id, OS.sel_addAttributes_1range_1, attrs !is null ? attrs.id : null, range);
+        OS.objc_msgSend(this.id_, OS.sel_addAttributes_1range_1, attrs !is null ? attrs.id_ : null, range);
     }
 
     public void appendAttributedString (NSAttributedString attrString)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendAttributedString_1, attrString !is null ? attrString.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_appendAttributedString_1, attrString !is null ? attrString.id_ : null);
     }
 
     public void beginEditing ()
     {
-        OS.objc_msgSend(this.id, OS.sel_beginEditing);
+        OS.objc_msgSend(this.id_, OS.sel_beginEditing);
     }
 
     public void deleteCharactersInRange (NSRange range)
     {
-        OS.objc_msgSend(this.id, OS.sel_deleteCharactersInRange_1, range);
+        OS.objc_msgSend(this.id_, OS.sel_deleteCharactersInRange_1, range);
     }
 
     public void endEditing ()
     {
-        OS.objc_msgSend(this.id, OS.sel_endEditing);
+        OS.objc_msgSend(this.id_, OS.sel_endEditing);
     }
 
     public void insertAttributedString (NSAttributedString attrString, NSUInteger loc)
     {
-        OS.objc_msgSend(this.id, OS.sel_insertAttributedString_1atIndex_1, attrString !is null ? attrString.id : null, loc);
+        OS.objc_msgSend(this.id_, OS.sel_insertAttributedString_1atIndex_1, attrString !is null ? attrString.id_ : null, loc);
     }
 
     public NSMutableString mutableString ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_mutableString);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_mutableString);
         return result !is null ? new NSMutableString(result) : null;
     }
 
     public void removeAttribute (NSString name, NSRange range)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeAttribute_1range_1, name !is null ? name.id : null, range);
+        OS.objc_msgSend(this.id_, OS.sel_removeAttribute_1range_1, name !is null ? name.id_ : null, range);
     }
 
     public void replaceCharactersInRange_withAttributedString_ (NSRange range, NSAttributedString attrString)
     {
-        OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_1withAttributedString_1, range, attrString !is null ? attrString.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_replaceCharactersInRange_1withAttributedString_1, range, attrString !is null ? attrString.id_ : null);
     }
 
     public void replaceCharactersInRange_withString_ (NSRange range, NSString str)
     {
-        OS.objc_msgSend(this.id, OS.sel_replaceCharactersInRange_1withString_1, range, str !is null ? str.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_replaceCharactersInRange_1withString_1, range, str !is null ? str.id_ : null);
     }
 
     public void setAttributedString (NSAttributedString attrString)
     {
-        OS.objc_msgSend(this.id, OS.sel_setAttributedString_1, attrString !is null ? attrString.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setAttributedString_1, attrString !is null ? attrString.id_ : null);
     }
 
     public void setAttributes (NSDictionary attrs, NSRange range)
     {
-        OS.objc_msgSend(this.id, OS.sel_setAttributes_1range_1, attrs !is null ? attrs.id : null, range);
+        OS.objc_msgSend(this.id_, OS.sel_setAttributes_1range_1, attrs !is null ? attrs.id_ : null, range);
     }
 
 }