--- a/dwt/internal/cocoa/NSBezierPath.d	Fri Sep 12 13:53:21 2008 +0200
+++ b/dwt/internal/cocoa/NSBezierPath.d	Sun Sep 14 01:45:57 2008 +0200
@@ -31,6 +31,42 @@
     NSClosePathBezierPathElement
 }
 
+NSBezierPathElement.NSMoveToBezierPathElement NSMoveToBezierPathElement;
+NSBezierPathElement.NSLineToBezierPathElement NSLineToBezierPathElement;
+NSBezierPathElement.NSCurveToBezierPathElement NSCurveToBezierPathElement;
+NSBezierPathElement.NSClosePathBezierPathElement NSClosePathBezierPathElement;
+
+enum NSLineCapStyle
+{
+    NSButtLineCapStyle = 0,
+    NSRoundLineCapStyle = 1,
+    NSSquareLineCapStyle = 2
+}
+
+NSLineCapStyle.NSButtLineCapStyle NSButtLineCapStyle;
+NSLineCapStyle.NSRoundLineCapStyle NSRoundLineCapStyle;
+NSLineCapStyle.NSSquareLineCapStyle NSSquareLineCapStyle;
+
+enum NSLineJoinStyle
+{
+    NSMiterLineJoinStyle = 0,
+    NSRoundLineJoinStyle = 1,
+    NSBevelLineJoinStyle = 2
+}
+
+NSLineJoinStyle.NSMiterLineJoinStyle NSMiterLineJoinStyle;
+NSLineJoinStyle.NSRoundLineJoinStyle NSRoundLineJoinStyle;
+NSLineJoinStyle.NSBevelLineJoinStyle NSBevelLineJoinStyle;
+
+enum NSWindingRule
+{
+    NSNonZeroWindingRule = 0,
+    NSEvenOddWindingRule = 1
+}
+
+alias NSWindingRule.NSNonZeroWindingRule NSNonZeroWindingRule;
+alias NSWindingRule.NSEvenOddWindingRule NSEvenOddWindingRule;
+
 public class NSBezierPath : NSObject
 {
     public this ()
@@ -70,12 +106,12 @@
                 endAngle, clockwise);
     }
 
-    public void appendBezierPathWithGlyph (objc.id glyph, NSFont font)
+    public void appendBezierPathWithGlyph (NSGlyph glyph, NSFont font)
     {
         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)
+    public void appendBezierPathWithGlyphs (NSGlyph* glyphs, NSInteger count, NSFont font)
     {
         OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithGlyphs_1count_1inFont_1, glyphs, count, font !is null ? font.id_ : null);
     }
@@ -85,12 +121,12 @@
         OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithOvalInRect_1, rect);
     }
 
-    public void appendBezierPathWithPackedGlyphs (objc.id packedGlyphs)
+    public void appendBezierPathWithPackedGlyphs (/*const*/char* packedGlyphs)
     {
         OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithPackedGlyphs_1, packedGlyphs);
     }
 
-    public void appendBezierPathWithPoints (objc.id points, NSInteger count)
+    public void appendBezierPathWithPoints (NSPointArray points, NSInteger count)
     {
         OS.objc_msgSend(this.id_, OS.sel_appendBezierPathWithPoints_1count_1, points, count);
     }
@@ -192,14 +228,14 @@
         return cast(CGFloat) OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultFlatness);
     }
 
-    public static objc.id defaultLineCapStyle ()
+    public static NSLineCapStyle defaultLineCapStyle ()
     {
-        return OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_defaultLineCapStyle);
+        return cast(NSLineCapStyle) OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_defaultLineCapStyle);
     }
 
-    public static objc.id defaultLineJoinStyle ()
+    public static NSLineJoinStyle defaultLineJoinStyle ()
     {
-        return OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_defaultLineJoinStyle);
+        return cast(NSLineJoinStyle) OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_defaultLineJoinStyle);
     }
 
     public static CGFloat defaultLineWidth ()
@@ -212,9 +248,9 @@
         return cast(CGFloat) OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultMiterLimit);
     }
 
-    public static objc.id defaultWindingRule ()
+    public static NSWindingRule defaultWindingRule ()
     {
-        return OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_defaultWindingRule);
+        return cast(NSWindingRule) OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_defaultWindingRule);
     }
 
     public static void drawPackedGlyphs (/*const*/char* packedGlyphs, NSPoint point)
@@ -222,9 +258,9 @@
         OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_drawPackedGlyphs_1atPoint_1, packedGlyphs, point);
     }
 
-    public objc.id elementAtIndex_ (NSInteger index)
+    public NSBezierPathElement elementAtIndex_ (NSInteger index)
     {
-        return OS.objc_msgSend(this.id_, OS.sel_elementAtIndex_1, index);
+        return cast(NSBezierPathElement) OS.objc_msgSend(this.id_, OS.sel_elementAtIndex_1, index);
     }
 
     public NSBezierPathElement elementAtIndex_associatedPoints_ (NSInteger index, NSPointArray points)
@@ -262,14 +298,14 @@
         return OS.objc_msgSend(this.id_, OS.sel_isEmpty) !is null;
     }
 
-    public objc.id lineCapStyle ()
+    public NSLineCapStyle lineCapStyle ()
     {
-        return OS.objc_msgSend(this.id_, OS.sel_lineCapStyle);
+        return cast(NSLineCapStyle) OS.objc_msgSend(this.id_, OS.sel_lineCapStyle);
     }
 
-    public objc.id lineJoinStyle ()
+    public NSLineJoinStyle lineJoinStyle ()
     {
-        return OS.objc_msgSend(this.id_, OS.sel_lineJoinStyle);
+        return cast(NSLineJoinStyle) OS.objc_msgSend(this.id_, OS.sel_lineJoinStyle);
     }
 
     public void lineToPoint (NSPoint point)
@@ -332,12 +368,12 @@
         OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultFlatness_1, flatness);
     }
 
-    public static void setDefaultLineCapStyle (objc.id lineCapStyle)
+    public static void setDefaultLineCapStyle (NSLineCapStyle lineCapStyle)
     {
         OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultLineCapStyle_1, lineCapStyle);
     }
 
-    public static void setDefaultLineJoinStyle (objc.id lineJoinStyle)
+    public static void setDefaultLineJoinStyle (NSLineJoinStyle lineJoinStyle)
     {
         OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultLineJoinStyle_1, lineJoinStyle);
     }
@@ -352,7 +388,7 @@
         OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultMiterLimit_1, limit);
     }
 
-    public static void setDefaultWindingRule (objc.id windingRule)
+    public static void setDefaultWindingRule (NSWindingRule windingRule)
     {
         OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultWindingRule_1, windingRule);
     }
@@ -362,7 +398,7 @@
         OS.objc_msgSend(this.id_, OS.sel_setFlatness_1, flatness);
     }
 
-    public void setLineCapStyle (objc.id lineCapStyle)
+    public void setLineCapStyle (NSLineCapStyle lineCapStyle)
     {
         OS.objc_msgSend(this.id_, OS.sel_setLineCapStyle_1, lineCapStyle);
     }
@@ -372,7 +408,7 @@
         OS.objc_msgSend(this.id_, OS.sel_setLineDash_1count_1phase_1, pattern, count, phase);
     }
 
-    public void setLineJoinStyle (objc.id lineJoinStyle)
+    public void setLineJoinStyle (NSLineJoinStyle lineJoinStyle)
     {
         OS.objc_msgSend(this.id_, OS.sel_setLineJoinStyle_1, lineJoinStyle);
     }
@@ -387,7 +423,7 @@
         OS.objc_msgSend(this.id_, OS.sel_setMiterLimit_1, miterLimit);
     }
 
-    public void setWindingRule (objc.id windingRule)
+    public void setWindingRule (NSWindingRule windingRule)
     {
         OS.objc_msgSend(this.id_, OS.sel_setWindingRule_1, windingRule);
     }
@@ -412,8 +448,8 @@
         OS.objc_msgSend(this.id_, OS.sel_transformUsingAffineTransform_1, transform !is null ? transform.id_ : null);
     }
 
-    public objc.id windingRule ()
+    public NSWindingRule windingRule ()
     {
-        return OS.objc_msgSend(this.id_, OS.sel_windingRule);
+        return cast(NSWindingRule) OS.objc_msgSend(this.id_, OS.sel_windingRule);
     }
 }