--- a/dwt/internal/cocoa/NSTextContainer.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSTextContainer.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSTextContainer;
 
+import dwt.internal.cocoa.CGFloat;
 import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSLayoutManager;
 import dwt.internal.cocoa.NSObject;
@@ -73,94 +74,94 @@
     public NSSize containerSize ()
     {
         NSSize result;
-        OS.objc_msgSend_struct(result, this.id, OS.sel_containerSize);
+        OS.objc_msgSend_struct(&result, this.id_, OS.sel_containerSize);
         return result;
     }
 
     public bool containsPoint (NSPoint point)
     {
-        return OS.objc_msgSend(this.id, OS.sel_containsPoint_1, point) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_containsPoint_1, point) !is null;
     }
 
     public bool heightTracksTextView ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_heightTracksTextView) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_heightTracksTextView) !is null;
     }
 
     public id initWithContainerSize (NSSize size)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_1, size);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithContainerSize_1, size);
         return result !is null ? new id(result) : null;
     }
 
     public bool isSimpleRectangularTextContainer ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isSimpleRectangularTextContainer) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isSimpleRectangularTextContainer) !is null;
     }
 
     public NSLayoutManager layoutManager ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_layoutManager);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_layoutManager);
         return result !is null ? new NSLayoutManager(result) : null;
     }
 
     public CGFloat lineFragmentPadding ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_lineFragmentPadding);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_lineFragmentPadding);
     }
 
     public NSRect lineFragmentRectForProposedRect (NSRect proposedRect, NSLineSweepDirection sweepDirection, NSLineMovementDirection movementDirection, NSRectPointer remainingRect)
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentRectForProposedRect_1sweepDirection_1movementDirection_1remainingRect_1,
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_lineFragmentRectForProposedRect_1sweepDirection_1movementDirection_1remainingRect_1,
                 proposedRect, sweepDirection, movementDirection, remainingRect);
         return result;
     }
 
     public void replaceLayoutManager (NSLayoutManager newLayoutManager)
     {
-        OS.objc_msgSend(this.id, OS.sel_replaceLayoutManager_1, newLayoutManager !is null ? newLayoutManager.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_replaceLayoutManager_1, newLayoutManager !is null ? newLayoutManager.id_ : null);
     }
 
     public void setContainerSize (NSSize size)
     {
-        OS.objc_msgSend(this.id, OS.sel_setContainerSize_1, size);
+        OS.objc_msgSend(this.id_, OS.sel_setContainerSize_1, size);
     }
 
     public void setHeightTracksTextView (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setHeightTracksTextView_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setHeightTracksTextView_1, flag);
     }
 
     public void setLayoutManager (NSLayoutManager layoutManager)
     {
-        OS.objc_msgSend(this.id, OS.sel_setLayoutManager_1, layoutManager !is null ? layoutManager.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setLayoutManager_1, layoutManager !is null ? layoutManager.id_ : null);
     }
 
     public void setLineFragmentPadding (CGFloat pad)
     {
-        OS.objc_msgSend(this.id, OS.sel_setLineFragmentPadding_1, pad);
+        OS.objc_msgSend(this.id_, OS.sel_setLineFragmentPadding_1, pad);
     }
 
     public void setTextView (NSTextView textView)
     {
-        OS.objc_msgSend(this.id, OS.sel_setTextView_1, textView !is null ? textView.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setTextView_1, textView !is null ? textView.id_ : null);
     }
 
     public void setWidthTracksTextView (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setWidthTracksTextView_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setWidthTracksTextView_1, flag);
     }
 
     public NSTextView textView ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_textView);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_textView);
         return result !is null ? new NSTextView(result) : null;
     }
 
     public bool widthTracksTextView ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_widthTracksTextView) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_widthTracksTextView) !is null;
     }
 
 }