--- a/dwt/internal/cocoa/NSSegmentedCell.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSSegmentedCell.d	Tue Aug 19 17:35:17 2008 +0200
@@ -38,7 +38,7 @@
 alias NSBackgroundStyle.NSBackgroundStyleRaised NSBackgroundStyleRaised;
 alias NSBackgroundStyle.NSBackgroundStyleLowered NSBackgroundStyleLowered;
 
-enum NSSegmentSwitchTracking
+enum NSSegmentSwitchTracking : NSUInteger
 {
     NSSegmentSwitchTrackingSelectOne = 0,
     NSSegmentSwitchTrackingSelectAny = 1,
@@ -64,161 +64,161 @@
 
     public void drawSegment (NSInteger segment, NSRect frame, NSView controlView)
     {
-        OS.objc_msgSend(this.id, OS.sel_drawSegment_1inFrame_1withView_1, segment, frame, controlView !is null ? controlView.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_drawSegment_1inFrame_1withView_1, segment, frame, controlView !is null ? controlView.id_ : null);
     }
 
     public NSImage imageForSegment (NSInteger segment)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_imageForSegment_1, segment);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_imageForSegment_1, segment);
         return result !is null ? new NSImage(result) : null;
     }
 
     public NSImageScaling imageScalingForSegment (NSInteger segment)
     {
-        return OS.objc_msgSend(this.id, OS.sel_imageScalingForSegment_1, segment);
+        return cast(NSImageScaling) OS.objc_msgSend(this.id_, OS.sel_imageScalingForSegment_1, segment);
     }
 
     public NSBackgroundStyle interiorBackgroundStyleForSegment (NSInteger segment)
     {
-        return OS.objc_msgSend(this.id, OS.sel_interiorBackgroundStyleForSegment_1, segment);
+        return cast(NSBackgroundStyle) OS.objc_msgSend(this.id_, OS.sel_interiorBackgroundStyleForSegment_1, segment);
     }
 
     public bool isEnabledForSegment (NSInteger segment)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isEnabledForSegment_1, segment) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isEnabledForSegment_1, segment) !is null;
     }
 
     public bool isSelectedForSegment (NSInteger segment)
     {
-        return OS.objc_msgSend(this.id, OS.sel_isSelectedForSegment_1, segment) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isSelectedForSegment_1, segment) !is null;
     }
 
     public NSString labelForSegment (NSInteger segment)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_labelForSegment_1, segment);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_labelForSegment_1, segment);
         return result !is null ? new NSString(result) : null;
     }
 
     public void makeNextSegmentKey ()
     {
-        OS.objc_msgSend(this.id, OS.sel_makeNextSegmentKey);
+        OS.objc_msgSend(this.id_, OS.sel_makeNextSegmentKey);
     }
 
     public void makePreviousSegmentKey ()
     {
-        OS.objc_msgSend(this.id, OS.sel_makePreviousSegmentKey);
+        OS.objc_msgSend(this.id_, OS.sel_makePreviousSegmentKey);
     }
 
     public NSMenu menuForSegment (NSInteger segment)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_menuForSegment_1, segment);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_menuForSegment_1, segment);
         return result !is null ? new NSMenu(result) : null;
     }
 
     public NSInteger segmentCount ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_segmentCount);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_segmentCount);
     }
 
     public NSInteger segmentStyle ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_segmentStyle);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_segmentStyle);
     }
 
     public bool selectSegmentWithTag (NSInteger tag)
     {
-        return OS.objc_msgSend(this.id, OS.sel_selectSegmentWithTag_1, tag) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_selectSegmentWithTag_1, tag) !is null;
     }
 
     public NSInteger selectedSegment ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_selectedSegment);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_selectedSegment);
     }
 
     public void setEnabled (bool enabled, NSInteger segment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setEnabled_1forSegment_1, enabled, segment);
+        OS.objc_msgSend(this.id_, OS.sel_setEnabled_1forSegment_1, enabled, segment);
     }
 
     public void setImage (NSImage image, NSInteger segment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setImage_1forSegment_1, image !is null ? image.id : null, segment);
+        OS.objc_msgSend(this.id_, OS.sel_setImage_1forSegment_1, image !is null ? image.id_ : null, segment);
     }
 
     public void setImageScaling (NSImageScaling scaling, NSInteger segment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setImageScaling_1forSegment_1, scaling, segment);
+        OS.objc_msgSend(this.id_, OS.sel_setImageScaling_1forSegment_1, scaling, segment);
     }
 
     public void setLabel (NSString label, NSInteger segment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setLabel_1forSegment_1, label !is null ? label.id : null, segment);
+        OS.objc_msgSend(this.id_, OS.sel_setLabel_1forSegment_1, label !is null ? label.id_ : null, segment);
     }
 
     public void setMenu (NSMenu menu, NSInteger segment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setMenu_1forSegment_1, menu !is null ? menu.id : null, segment);
+        OS.objc_msgSend(this.id_, OS.sel_setMenu_1forSegment_1, menu !is null ? menu.id_ : null, segment);
     }
 
     public void setSegmentCount (NSInteger count)
     {
-        OS.objc_msgSend(this.id, OS.sel_setSegmentCount_1, count);
+        OS.objc_msgSend(this.id_, OS.sel_setSegmentCount_1, count);
     }
 
     public void setSegmentStyle (NSInteger segmentStyle)
     {
-        OS.objc_msgSend(this.id, OS.sel_setSegmentStyle_1, segmentStyle);
+        OS.objc_msgSend(this.id_, OS.sel_setSegmentStyle_1, segmentStyle);
     }
 
     public void setSelected (bool selected, NSInteger segment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setSelected_1forSegment_1, selected, segment);
+        OS.objc_msgSend(this.id_, OS.sel_setSelected_1forSegment_1, selected, segment);
     }
 
     public void setSelectedSegment (NSInteger selectedSegment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setSelectedSegment_1, selectedSegment);
+        OS.objc_msgSend(this.id_, OS.sel_setSelectedSegment_1, selectedSegment);
     }
 
     public void setTag (NSInteger tag, NSInteger segment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setTag_1forSegment_1, tag, segment);
+        OS.objc_msgSend(this.id_, OS.sel_setTag_1forSegment_1, tag, segment);
     }
 
     public void setToolTip (NSString toolTip, NSInteger segment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setToolTip_1forSegment_1, toolTip !is null ? toolTip.id : null, segment);
+        OS.objc_msgSend(this.id_, OS.sel_setToolTip_1forSegment_1, toolTip !is null ? toolTip.id_ : null, segment);
     }
 
     public void setTrackingMode (NSSegmentSwitchTracking trackingMode)
     {
-        OS.objc_msgSend(this.id, OS.sel_setTrackingMode_1, trackingMode);
+        OS.objc_msgSend(this.id_, OS.sel_setTrackingMode_1, trackingMode);
     }
 
     public void setWidth (CGFloat width, NSInteger segment)
     {
-        OS.objc_msgSend(this.id, OS.sel_setWidth_1forSegment_1, width, segment);
+        OS.objc_msgSend(this.id_, OS.sel_setWidth_1forSegment_1, width, segment);
     }
 
     public NSInteger tagForSegment (NSInteger segment)
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_tagForSegment_1, segment);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_tagForSegment_1, segment);
     }
 
     public NSString toolTipForSegment (NSInteger segment)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_toolTipForSegment_1, segment);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_toolTipForSegment_1, segment);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSSegmentSwitchTracking trackingMode ()
     {
-        return cast(NSSegmentSwitchTracking) OS.objc_msgSend(this.id, OS.sel_trackingMode);
+        return cast(NSSegmentSwitchTracking) OS.objc_msgSend(this.id_, OS.sel_trackingMode);
     }
 
     public CGFloat widthForSegment (NSInteger segment)
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_widthForSegment_1, segment);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_widthForSegment_1, segment);
     }
 
 }