--- a/dwt/internal/cocoa/NSClipView.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSClipView.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSClipView;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSColor;
 import dwt.internal.cocoa.NSCursor;
 import dwt.internal.cocoa.NSEvent;
@@ -38,96 +39,96 @@
 
     public bool autoscroll (NSEvent theEvent)
     {
-        return OS.objc_msgSend(this.id, OS.sel_autoscroll_1, theEvent !is null ? theEvent.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_autoscroll_1, theEvent !is null ? theEvent.id_ : null) !is 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 NSPoint constrainScrollPoint (NSPoint newOrigin)
     {
         NSPoint result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_constrainScrollPoint_1, newOrigin);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_constrainScrollPoint_1, newOrigin);
         return result;
     }
 
     public bool copiesOnScroll ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_copiesOnScroll) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_copiesOnScroll) !is null;
     }
 
     public NSCursor documentCursor ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_documentCursor);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_documentCursor);
         return result !is null ? new NSCursor(result) : null;
     }
 
     public NSRect documentRect ()
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_documentRect);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_documentRect);
         return result;
     }
 
     public id documentView ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_documentView);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_documentView);
         return result !is null ? new id(result) : null;
     }
 
     public NSRect documentVisibleRect ()
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_documentVisibleRect);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_documentVisibleRect);
         return result;
     }
 
     public bool drawsBackground ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_drawsBackground) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_drawsBackground) !is null;
     }
 
     public void scrollToPoint (NSPoint newOrigin)
     {
-        OS.objc_msgSend(this.id, OS.sel_scrollToPoint_1, newOrigin);
+        OS.objc_msgSend(this.id_, OS.sel_scrollToPoint_1, newOrigin);
     }
 
     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 setCopiesOnScroll (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setCopiesOnScroll_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setCopiesOnScroll_1, flag);
     }
 
     public void setDocumentCursor (NSCursor anObj)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDocumentCursor_1, anObj !is null ? anObj.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDocumentCursor_1, anObj !is null ? anObj.id_ : null);
     }
 
     public void setDocumentView (NSView aView)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDocumentView_1, aView !is null ? aView.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDocumentView_1, aView !is null ? aView.id_ : null);
     }
 
     public void setDrawsBackground (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setDrawsBackground_1, flag);
     }
 
     public void viewBoundsChanged (NSNotification notification)
     {
-        OS.objc_msgSend(this.id, OS.sel_viewBoundsChanged_1, notification !is null ? notification.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_viewBoundsChanged_1, notification !is null ? notification.id_ : null);
     }
 
     public void viewFrameChanged (NSNotification notification)
     {
-        OS.objc_msgSend(this.id, OS.sel_viewFrameChanged_1, notification !is null ? notification.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_viewFrameChanged_1, notification !is null ? notification.id_ : null);
     }
 
 }