--- a/dwt/internal/cocoa/NSPasteboard.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSPasteboard.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSPasteboard;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSArray;
 import dwt.internal.cocoa.NSData;
 import dwt.internal.cocoa.NSFileWrapper;
@@ -37,29 +38,29 @@
 
     public NSInteger addTypes (NSArray newTypes, id newOwner)
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_addTypes_1owner_1, newTypes !is null ? newTypes.id : null, newOwner !is null ? newOwner.id : null);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_addTypes_1owner_1, newTypes !is null ? newTypes.id_ : null, newOwner !is null ? newOwner.id_ : null);
     }
 
     public NSString availableTypeFromArray (NSArray types)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_availableTypeFromArray_1, types !is null ? types.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_availableTypeFromArray_1, types !is null ? types.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSInteger changeCount ()
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_changeCount);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_changeCount);
     }
 
     public NSData dataForType (NSString dataType)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_dataForType_1, dataType !is null ? dataType.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_dataForType_1, dataType !is null ? dataType.id_ : null);
         return result !is null ? new NSData(result) : null;
     }
 
     public NSInteger declareTypes (NSArray newTypes, id newOwner)
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_declareTypes_1owner_1, newTypes !is null ? newTypes.id : null, newOwner !is null ? newOwner.id : null);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_declareTypes_1owner_1, newTypes !is null ? newTypes.id_ : null, newOwner !is null ? newOwner.id_ : null);
     }
 
     public static NSPasteboard generalPasteboard ()
@@ -70,32 +71,32 @@
 
     public NSString name ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_name);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_name);
         return result !is null ? new NSString(result) : null;
     }
 
     public static NSPasteboard pasteboardByFilteringData (NSData data, NSString type)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardByFilteringData_1ofType_1, data !is null ? data.id : null,
-                type !is null ? type.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardByFilteringData_1ofType_1, data !is null ? data.id_ : null,
+                type !is null ? type.id_ : null);
         return result !is null ? new NSPasteboard(result) : null;
     }
 
     public static NSPasteboard pasteboardByFilteringFile (NSString filename)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardByFilteringFile_1, filename !is null ? filename.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardByFilteringFile_1, filename !is null ? filename.id_ : null);
         return result !is null ? new NSPasteboard(result) : null;
     }
 
     public static NSPasteboard pasteboardByFilteringTypesInPasteboard (NSPasteboard pboard)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardByFilteringTypesInPasteboard_1, pboard !is null ? pboard.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardByFilteringTypesInPasteboard_1, pboard !is null ? pboard.id_ : null);
         return result !is null ? new NSPasteboard(result) : null;
     }
 
     public static NSPasteboard pasteboardWithName (NSString name)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithName_1, name !is null ? name.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithName_1, name !is null ? name.id_ : null);
         return result !is null ? new NSPasteboard(result) : null;
     }
 
@@ -107,69 +108,69 @@
 
     public id propertyListForType (NSString dataType)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_propertyListForType_1, dataType !is null ? dataType.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_propertyListForType_1, dataType !is null ? dataType.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public NSString readFileContentsType (NSString type, NSString filename)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_readFileContentsType_1toFile_1, type !is null ? type.id : null,
-                filename !is null ? filename.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_readFileContentsType_1toFile_1, type !is null ? type.id_ : null,
+                filename !is null ? filename.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSFileWrapper readFileWrapper ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_readFileWrapper);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_readFileWrapper);
         return result !is null ? new NSFileWrapper(result) : null;
     }
 
     public void releaseGlobally ()
     {
-        OS.objc_msgSend(this.id, OS.sel_releaseGlobally);
+        OS.objc_msgSend(this.id_, OS.sel_releaseGlobally);
     }
 
     public bool setData (NSData data, NSString dataType)
     {
-        return OS.objc_msgSend(this.id, OS.sel_setData_1forType_1, data !is null ? data.id : null, dataType !is null ? dataType.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_setData_1forType_1, data !is null ? data.id_ : null, dataType !is null ? dataType.id_ : null) !is null;
     }
 
     public bool setPropertyList (id plist, NSString dataType)
     {
-        return OS.objc_msgSend(this.id, OS.sel_setPropertyList_1forType_1, plist !is null ? plist.id : null, dataType !is null ? dataType.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_setPropertyList_1forType_1, plist !is null ? plist.id_ : null, dataType !is null ? dataType.id_ : null) !is null;
     }
 
     public bool setString (NSString string, NSString dataType)
     {
-        return OS.objc_msgSend(this.id, OS.sel_setString_1forType_1, string !is null ? string.id : null, dataType !is null ? dataType.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_setString_1forType_1, string !is null ? string.id_ : null, dataType !is null ? dataType.id_ : null) !is null;
     }
 
     public NSString stringForType (NSString dataType)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_stringForType_1, dataType !is null ? dataType.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_stringForType_1, dataType !is null ? dataType.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSArray types ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_types);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_types);
         return result !is null ? new NSArray(result) : null;
     }
 
     public static NSArray typesFilterableTo (NSString type)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_typesFilterableTo_1, type !is null ? type.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_typesFilterableTo_1, type !is null ? type.id_ : null);
         return result !is null ? new NSArray(result) : null;
     }
 
     public bool writeFileContents (NSString filename)
     {
-        return OS.objc_msgSend(this.id, OS.sel_writeFileContents_1, filename !is null ? filename.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_writeFileContents_1, filename !is null ? filename.id_ : null) !is null;
     }
 
     public bool writeFileWrapper (NSFileWrapper wrapper)
     {
-        return OS.objc_msgSend(this.id, OS.sel_writeFileWrapper_1, wrapper !is null ? wrapper.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_writeFileWrapper_1, wrapper !is null ? wrapper.id_ : null) !is null;
     }
 
 }