--- a/dwt/internal/cocoa/NSPathCell.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSPathCell.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSPathCell;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSActionCell;
 import dwt.internal.cocoa.NSArray;
 import dwt.internal.cocoa.NSAttributedString;
@@ -23,6 +24,7 @@
 import dwt.internal.cocoa.NSPathComponentCell;
 import dwt.internal.cocoa.NSPoint;
 import dwt.internal.cocoa.NSRect;
+import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.NSURL;
 import dwt.internal.cocoa.NSView;
 import dwt.internal.cocoa.OS;
@@ -52,52 +54,52 @@
 
     public NSURL URL ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_URL);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_URL);
         return result !is null ? new NSURL(result) : null;
     }
 
     public NSArray allowedTypes ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_allowedTypes);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_allowedTypes);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSColor backgroundColor ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_backgroundColor);
         return result !is null ? new NSColor(result) : null;
     }
 
     public NSPathComponentCell clickedPathComponentCell ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_clickedPathComponentCell);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_clickedPathComponentCell);
         return result !is null ? new NSPathComponentCell(result) : null;
     }
 
     public id delegatee ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_delegate);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_delegate);
         return result !is null ? new id(result) : null;
     }
 
     public objc.SEL doubleAction ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_doubleAction);
+        return cast(objc.SEL) OS.objc_msgSend(this.id_, OS.sel_doubleAction);
     }
 
     public void mouseEntered (NSEvent event, NSRect frame, NSView view)
     {
-        OS.objc_msgSend(this.id, OS.sel_mouseEntered_1withFrame_1inView_1, event !is null ? event.id : null, frame, view !is null ? view.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_mouseEntered_1withFrame_1inView_1, event !is null ? event.id_ : null, frame, view !is null ? view.id_ : null);
     }
 
     public void mouseExited (NSEvent event, NSRect frame, NSView view)
     {
-        OS.objc_msgSend(this.id, OS.sel_mouseExited_1withFrame_1inView_1, event !is null ? event.id : null, frame, view !is null ? view.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_mouseExited_1withFrame_1inView_1, event !is null ? event.id_ : null, frame, view !is null ? view.id_ : null);
     }
 
     public NSPathComponentCell pathComponentCellAtPoint (NSPoint point, NSRect frame, NSView view)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pathComponentCellAtPoint_1withFrame_1inView_1, point, frame, view !is null ? view.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pathComponentCellAtPoint_1withFrame_1inView_1, point, frame, view !is null ? view.id_ : null);
         return result !is null ? new NSPathComponentCell(result) : null;
     }
 
@@ -108,88 +110,88 @@
 
     public NSArray pathComponentCells ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pathComponentCells);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pathComponentCells);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSPathStyle pathStyle ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_pathStyle);
+        return cast(NSPathStyle) OS.objc_msgSend(this.id_, OS.sel_pathStyle);
     }
 
     public NSAttributedString placeholderAttributedString ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_placeholderAttributedString);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_placeholderAttributedString);
         return result !is null ? new NSAttributedString(result) : null;
     }
 
     public NSString placeholderString ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_placeholderString);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_placeholderString);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSRect rectOfPathComponentCell (NSPathComponentCell cell, NSRect frame, NSView view)
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfPathComponentCell_1withFrame_1inView_1, cell !is null ? cell.id : null, frame,
-                view !is null ? view.id : null);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_rectOfPathComponentCell_1withFrame_1inView_1, cell !is null ? cell.id_ : null, frame,
+                view !is null ? view.id_ : null);
         return result;
     }
 
     public void setAllowedTypes (NSArray allowedTypes)
     {
-        OS.objc_msgSend(this.id, OS.sel_setAllowedTypes_1, allowedTypes !is null ? allowedTypes.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setAllowedTypes_1, allowedTypes !is null ? allowedTypes.id_ : null);
     }
 
     public void setBackgroundColor (NSColor color)
     {
-        OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_1, color !is null ? color.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setBackgroundColor_1, color !is null ? color.id_ : null);
     }
 
     public void setControlSize (NSControlSize size)
     {
-        OS.objc_msgSend(this.id, OS.sel_setControlSize_1, size);
+        OS.objc_msgSend(this.id_, OS.sel_setControlSize_1, size);
     }
 
     public void setDelegate (id value)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDelegate_1, value !is null ? value.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDelegate_1, value !is null ? value.id_ : null);
     }
 
     public void setDoubleAction (objc.SEL action)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDoubleAction_1, action);
+        OS.objc_msgSend(this.id_, OS.sel_setDoubleAction_1, action);
     }
 
     public void setObjectValue (id obj)
     {
-        OS.objc_msgSend(this.id, OS.sel_setObjectValue_1, obj !is null ? obj.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setObjectValue_1, obj !is null ? obj.id_ : null);
     }
 
     public void setPathComponentCells (NSArray cells)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPathComponentCells_1, cells !is null ? cells.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setPathComponentCells_1, cells !is null ? cells.id_ : null);
     }
 
     public void setPathStyle (NSPathStyle style)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPathStyle_1, style);
+        OS.objc_msgSend(this.id_, OS.sel_setPathStyle_1, style);
     }
 
     public void setPlaceholderAttributedString (NSAttributedString string)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPlaceholderAttributedString_1, string !is null ? string.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setPlaceholderAttributedString_1, string !is null ? string.id_ : null);
     }
 
     public void setPlaceholderString (NSString string)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPlaceholderString_1, string !is null ? string.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setPlaceholderString_1, string !is null ? string.id_ : null);
     }
 
     public void setURL (NSURL url)
     {
-        OS.objc_msgSend(this.id, OS.sel_setURL_1, url !is null ? url.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setURL_1, url !is null ? url.id_ : null);
     }
 
 }