--- a/dwt/internal/cocoa/NSBezierPath.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSBezierPath.d	Tue Aug 19 17:35:17 2008 +0200
@@ -45,64 +45,64 @@
 
     public void addClip ()
     {
-        OS.objc_msgSend(this.id, OS.sel_addClip);
+        OS.objc_msgSend(this.id_, OS.sel_addClip);
     }
 
     public void appendBezierPath (NSBezierPath path)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPath_1, path !is null ? path.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPath_1, path !is null ? path.id_ : null);
     }
 
     public void appendBezierPathWithArcFromPoint (NSPoint point1, NSPoint point2, CGFloat radius)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcFromPoint_1toPoint_1radius_1, point1, point2, radius);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithArcFromPoint_1toPoint_1radius_1, point1, point2, radius);
     }
 
     public void appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_ (NSPoint center, CGFloat radius, CGFloat startAngle, CGFloat endAngle)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_1radius_1startAngle_1endAngle_1, center, radius, startAngle, endAngle);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithArcWithCenter_1radius_1startAngle_1endAngle_1, center, radius, startAngle, endAngle);
     }
 
     public void appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_ (NSPoint center, CGFloat radius, CGFloat startAngle,
             CGFloat endAngle, bool clockwise)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_1radius_1startAngle_1endAngle_1clockwise_1, center, radius, startAngle,
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithArcWithCenter_1radius_1startAngle_1endAngle_1clockwise_1, center, radius, startAngle,
                 endAngle, clockwise);
     }
 
     public void appendBezierPathWithGlyph (objc.id glyph, NSFont font)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithGlyph_1inFont_1, glyph, font !is null ? font.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithGlyph_1inFont_1, glyph, font !is null ? font.id_ : null);
     }
 
     public void appendBezierPathWithGlyphs (objc.id glyphs, NSInteger count, NSFont font)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithGlyphs_1count_1inFont_1, glyphs, count, font !is null ? font.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithGlyphs_1count_1inFont_1, glyphs, count, font !is null ? font.id_ : null);
     }
 
     public void appendBezierPathWithOvalInRect (NSRect rect)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithOvalInRect_1, rect);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithOvalInRect_1, rect);
     }
 
     public void appendBezierPathWithPackedGlyphs (objc.id packedGlyphs)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithPackedGlyphs_1, packedGlyphs);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithPackedGlyphs_1, packedGlyphs);
     }
 
     public void appendBezierPathWithPoints (objc.id points, NSInteger count)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithPoints_1count_1, points, count);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithPoints_1count_1, points, count);
     }
 
     public void appendBezierPathWithRect (NSRect rect)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRect_1, rect);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithRect_1, rect);
     }
 
     public void appendBezierPathWithRoundedRect (NSRect rect, CGFloat xRadius, CGFloat yRadius)
     {
-        OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRoundedRect_1xRadius_1yRadius_1, rect, xRadius, yRadius);
+        OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithRoundedRect_1xRadius_1yRadius_1, rect, xRadius, yRadius);
     }
 
     public static NSBezierPath bezierPath ()
@@ -113,14 +113,14 @@
 
     public NSBezierPath bezierPathByFlatteningPath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_bezierPathByFlatteningPath);
-        return result is this.id ? this : (result !is null ? new NSBezierPath(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_bezierPathByFlatteningPath);
+        return result is this.id_ ? this : (result !is null ? new NSBezierPath(result) : null);
     }
 
     public NSBezierPath bezierPathByReversingPath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_bezierPathByReversingPath);
-        return result is this.id ? this : (result !is null ? new NSBezierPath(result) : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_bezierPathByReversingPath);
+        return result is this.id_ ? this : (result !is null ? new NSBezierPath(result) : null);
     }
 
     public static NSBezierPath bezierPathWithOvalInRect (NSRect rect)
@@ -144,13 +144,13 @@
     public NSRect bounds ()
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_bounds);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_bounds);
         return result;
     }
 
     public bool cachesBezierPath ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_cachesBezierPath) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_cachesBezierPath) !is null;
     }
 
     public static void clipRect (NSRect rect)
@@ -160,31 +160,31 @@
 
     public void closePath ()
     {
-        OS.objc_msgSend(this.id, OS.sel_closePath);
+        OS.objc_msgSend(this.id_, OS.sel_closePath);
     }
 
     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 NSRect controlPointBounds ()
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_controlPointBounds);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_controlPointBounds);
         return result;
     }
 
     public NSPoint currentPoint ()
     {
         NSPoint result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_currentPoint);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_currentPoint);
         return result;
     }
 
     public void curveToPoint (NSPoint endPoint, NSPoint controlPoint1, NSPoint controlPoint2)
     {
-        OS.objc_msgSend(this.id, OS.sel_curveToPoint_1controlPoint1_1controlPoint2_1, endPoint, controlPoint1, controlPoint2);
+        OS.objc_msgSend(this.id_, OS.sel_curveToPoint_1controlPoint1_1controlPoint2_1, endPoint, controlPoint1, controlPoint2);
     }
 
     public static CGFloat defaultFlatness ()
@@ -224,22 +224,22 @@
 
     public objc.id elementAtIndex_ (NSInteger index)
     {
-        return OS.objc_msgSend(this.id, OS.sel_elementAtIndex_1, index);
+        return OS.objc_msgSend(this.id_, OS.sel_elementAtIndex_1, index);
     }
 
     public NSBezierPathElement elementAtIndex_associatedPoints_ (NSInteger index, NSPointArray points)
     {
-        return OS.objc_msgSend(this.id, OS.sel_elementAtIndex_1associatedPoints_1, index, points);
+        return cast(NSBezierPathElement) OS.objc_msgSend(this.id_, OS.sel_elementAtIndex_1associatedPoints_1, index, points);
     }
 
     public NSInteger elementCount ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_elementCount);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_elementCount);
     }
 
     public void fill ()
     {
-        OS.objc_msgSend(this.id, OS.sel_fill);
+        OS.objc_msgSend(this.id_, OS.sel_fill);
     }
 
     public static void fillRect (NSRect rect)
@@ -249,82 +249,82 @@
 
     public CGFloat flatness ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_flatness);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_flatness);
     }
 
     public void getLineDash (CGFloat* pattern, NSInteger* count, CGFloat* phase)
     {
-        OS.objc_msgSend(this.id, OS.sel_getLineDash_1count_1phase_1, pattern, count, phase);
+        OS.objc_msgSend(this.id_, OS.sel_getLineDash_1count_1phase_1, pattern, count, phase);
     }
 
     public bool isEmpty ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isEmpty) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isEmpty) !is null;
     }
 
     public objc.id lineCapStyle ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_lineCapStyle);
+        return OS.objc_msgSend(this.id_, OS.sel_lineCapStyle);
     }
 
     public objc.id lineJoinStyle ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_lineJoinStyle);
+        return OS.objc_msgSend(this.id_, OS.sel_lineJoinStyle);
     }
 
     public void lineToPoint (NSPoint point)
     {
-        OS.objc_msgSend(this.id, OS.sel_lineToPoint_1, point);
+        OS.objc_msgSend(this.id_, OS.sel_lineToPoint_1, point);
     }
 
     public CGFloat lineWidth ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_lineWidth);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_lineWidth);
     }
 
     public CGFloat miterLimit ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_miterLimit);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_miterLimit);
     }
 
     public void moveToPoint (NSPoint point)
     {
-        OS.objc_msgSend(this.id, OS.sel_moveToPoint_1, point);
+        OS.objc_msgSend(this.id_, OS.sel_moveToPoint_1, point);
     }
 
     public void relativeCurveToPoint (NSPoint endPoint, NSPoint controlPoint1, NSPoint controlPoint2)
     {
-        OS.objc_msgSend(this.id, OS.sel_relativeCurveToPoint_1controlPoint1_1controlPoint2_1, endPoint, controlPoint1, controlPoint2);
+        OS.objc_msgSend(this.id_, OS.sel_relativeCurveToPoint_1controlPoint1_1controlPoint2_1, endPoint, controlPoint1, controlPoint2);
     }
 
     public void relativeLineToPoint (NSPoint point)
     {
-        OS.objc_msgSend(this.id, OS.sel_relativeLineToPoint_1, point);
+        OS.objc_msgSend(this.id_, OS.sel_relativeLineToPoint_1, point);
     }
 
     public void relativeMoveToPoint (NSPoint point)
     {
-        OS.objc_msgSend(this.id, OS.sel_relativeMoveToPoint_1, point);
+        OS.objc_msgSend(this.id_, OS.sel_relativeMoveToPoint_1, point);
     }
 
     public void removeAllPoints ()
     {
-        OS.objc_msgSend(this.id, OS.sel_removeAllPoints);
+        OS.objc_msgSend(this.id_, OS.sel_removeAllPoints);
     }
 
     public void setAssociatedPoints (NSPointArray points, NSInteger index)
     {
-        OS.objc_msgSend(this.id, OS.sel_setAssociatedPoints_1atIndex_1, points, index);
+        OS.objc_msgSend(this.id_, OS.sel_setAssociatedPoints_1atIndex_1, points, index);
     }
 
     public void setCachesBezierPath (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setCachesBezierPath_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setCachesBezierPath_1, flag);
     }
 
     public void setClip ()
     {
-        OS.objc_msgSend(this.id, OS.sel_setClip);
+        OS.objc_msgSend(this.id_, OS.sel_setClip);
     }
 
     public static void setDefaultFlatness (CGFloat flatness)
@@ -359,42 +359,42 @@
 
     public void setFlatness (CGFloat flatness)
     {
-        OS.objc_msgSend(this.id, OS.sel_setFlatness_1, flatness);
+        OS.objc_msgSend(this.id_, OS.sel_setFlatness_1, flatness);
     }
 
     public void setLineCapStyle (objc.id lineCapStyle)
     {
-        OS.objc_msgSend(this.id, OS.sel_setLineCapStyle_1, lineCapStyle);
+        OS.objc_msgSend(this.id_, OS.sel_setLineCapStyle_1, lineCapStyle);
     }
 
     public void setLineDash (/*const*/CGFloat* pattern, NSInteger count, CGFloat phase)
     {
-        OS.objc_msgSend(this.id, OS.sel_setLineDash_1count_1phase_1, pattern, count, phase);
+        OS.objc_msgSend(this.id_, OS.sel_setLineDash_1count_1phase_1, pattern, count, phase);
     }
 
     public void setLineJoinStyle (objc.id lineJoinStyle)
     {
-        OS.objc_msgSend(this.id, OS.sel_setLineJoinStyle_1, lineJoinStyle);
+        OS.objc_msgSend(this.id_, OS.sel_setLineJoinStyle_1, lineJoinStyle);
     }
 
     public void setLineWidth (CGFloat lineWidth)
     {
-        OS.objc_msgSend(this.id, OS.sel_setLineWidth_1, lineWidth);
+        OS.objc_msgSend(this.id_, OS.sel_setLineWidth_1, lineWidth);
     }
 
     public void setMiterLimit (CGFloat miterLimit)
     {
-        OS.objc_msgSend(this.id, OS.sel_setMiterLimit_1, miterLimit);
+        OS.objc_msgSend(this.id_, OS.sel_setMiterLimit_1, miterLimit);
     }
 
     public void setWindingRule (objc.id windingRule)
     {
-        OS.objc_msgSend(this.id, OS.sel_setWindingRule_1, windingRule);
+        OS.objc_msgSend(this.id_, OS.sel_setWindingRule_1, windingRule);
     }
 
     public void stroke ()
     {
-        OS.objc_msgSend(this.id, OS.sel_stroke);
+        OS.objc_msgSend(this.id_, OS.sel_stroke);
     }
 
     public static void strokeLineFromPoint (NSPoint point1, NSPoint point2)
@@ -409,11 +409,11 @@
 
     public void transformUsingAffineTransform (NSAffineTransform transform)
     {
-        OS.objc_msgSend(this.id, OS.sel_transformUsingAffineTransform_1, transform !is null ? transform.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_transformUsingAffineTransform_1, transform !is null ? transform.id_ : null);
     }
 
     public objc.id windingRule ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_windingRule);
+        return OS.objc_msgSend(this.id_, OS.sel_windingRule);
     }
 }