--- a/dwt/internal/cocoa/NSRulerMarker.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSRulerMarker.d	Tue Aug 19 17:35:17 2008 +0200
@@ -39,106 +39,106 @@
 
     public void drawRect (NSRect rect)
     {
-        OS.objc_msgSend(this.id, OS.sel_drawRect_1, rect);
+        OS.objc_msgSend(this.id_, OS.sel_drawRect_1, rect);
     }
 
     public NSImage image ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_image);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_image);
         return result !is null ? new NSImage(result) : null;
     }
 
     public NSPoint imageOrigin ()
     {
         NSPoint result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_imageOrigin);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_imageOrigin);
         return result;
     }
 
     public NSRect imageRectInRuler ()
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_imageRectInRuler);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_imageRectInRuler);
         return result;
     }
 
     public id initWithRulerView (NSRulerView ruler, CGFloat location, NSImage image, NSPoint imageOrigin)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithRulerView_1markerLocation_1image_1imageOrigin_1, ruler !is null ? ruler.id : null,
-                location, image !is null ? image.id : null, imageOrigin);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithRulerView_1markerLocation_1image_1imageOrigin_1, ruler !is null ? ruler.id_ : null,
+                location, image !is null ? image.id_ : null, imageOrigin);
         return result !is null ? new id(result) : null;
     }
 
     public bool isDragging ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isDragging) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isDragging) !is null;
     }
 
     public bool isMovable ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isMovable) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isMovable) !is null;
     }
 
     public bool isRemovable ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isRemovable) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isRemovable) !is null;
     }
 
     public CGFloat markerLocation ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_markerLocation);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_markerLocation);
     }
 
     public id representedObject ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_representedObject);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_representedObject);
         return result !is null ? new id(result) : null;
     }
 
     public NSRulerView ruler ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_ruler);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_ruler);
         return result !is null ? new NSRulerView(result) : null;
     }
 
     public void setImage (NSImage image)
     {
-        OS.objc_msgSend(this.id, OS.sel_setImage_1, image !is null ? image.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setImage_1, image !is null ? image.id_ : null);
     }
 
     public void setImageOrigin (NSPoint imageOrigin)
     {
-        OS.objc_msgSend(this.id, OS.sel_setImageOrigin_1, imageOrigin);
+        OS.objc_msgSend(this.id_, OS.sel_setImageOrigin_1, imageOrigin);
     }
 
     public void setMarkerLocation (CGFloat location)
     {
-        OS.objc_msgSend(this.id, OS.sel_setMarkerLocation_1, location);
+        OS.objc_msgSend(this.id_, OS.sel_setMarkerLocation_1, location);
     }
 
     public void setMovable (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setMovable_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setMovable_1, flag);
     }
 
     public void setRemovable (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setRemovable_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setRemovable_1, flag);
     }
 
     public void setRepresentedObject (id representedObject)
     {
-        OS.objc_msgSend(this.id, OS.sel_setRepresentedObject_1, representedObject !is null ? representedObject.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setRepresentedObject_1, representedObject !is null ? representedObject.id_ : null);
     }
 
     public CGFloat thicknessRequiredInRuler ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_thicknessRequiredInRuler);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_thicknessRequiredInRuler);
     }
 
     public bool trackMouse (NSEvent mouseDownEvent, bool isAdding)
     {
-        return OS.objc_msgSend(this.id, OS.sel_trackMouse_1adding_1, mouseDownEvent !is null ? mouseDownEvent.id : null, isAdding) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_trackMouse_1adding_1, mouseDownEvent !is null ? mouseDownEvent.id_ : null, isAdding) !is null;
     }
 
 }