--- a/dwt/internal/cocoa/NSScroller.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSScroller.d	Tue Aug 19 17:35:17 2008 +0200
@@ -20,7 +20,7 @@
 import dwt.internal.cocoa.NSPoint;
 import dwt.internal.cocoa.NSRect;
 import dwt.internal.cocoa.OS;
-import dwt.internal.objc.runtime;
+import objc = dwt.internal.objc.runtime;
 
 
 
@@ -97,63 +97,63 @@
 
     public NSScrollArrowPosition arrowsPosition ()
     {
-        return cast(NSScrollArrowPosition) OS.objc_msgSend(this.id, OS.sel_arrowsPosition);
+        return cast(NSScrollArrowPosition) OS.objc_msgSend(this.id_, OS.sel_arrowsPosition);
     }
 
     public void checkSpaceForParts ()
     {
-        OS.objc_msgSend(this.id, OS.sel_checkSpaceForParts);
+        OS.objc_msgSend(this.id_, OS.sel_checkSpaceForParts);
     }
 
     public NSControlSize controlSize ()
     {
-        return cast(NSControlSize) OS.objc_msgSend(this.id, OS.sel_controlSize);
+        return cast(NSControlSize) OS.objc_msgSend(this.id_, OS.sel_controlSize);
     }
 
     public NSControlTint controlTint ()
     {
-        return cast(NSControlTint) OS.objc_msgSend(this.id, OS.sel_controlTint);
+        return cast(NSControlTint) OS.objc_msgSend(this.id_, OS.sel_controlTint);
     }
 
     public void drawArrow (NSScrollerArrow whichArrow, bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_drawArrow_1highlight_1, whichArrow, flag);
+        OS.objc_msgSend(this.id_, OS.sel_drawArrow_1highlight_1, whichArrow, flag);
     }
 
     public void drawKnob ()
     {
-        OS.objc_msgSend(this.id, OS.sel_drawKnob);
+        OS.objc_msgSend(this.id_, OS.sel_drawKnob);
     }
 
     public void drawKnobSlotInRect (NSRect slotRect, bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_drawKnobSlotInRect_1highlight_1, slotRect, flag);
+        OS.objc_msgSend(this.id_, OS.sel_drawKnobSlotInRect_1highlight_1, slotRect, flag);
     }
 
     public void drawParts ()
     {
-        OS.objc_msgSend(this.id, OS.sel_drawParts);
+        OS.objc_msgSend(this.id_, OS.sel_drawParts);
     }
 
     public void highlight (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_highlight_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_highlight_1, flag);
     }
 
     public NSScrollerPart hitPart ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_hitPart);
+        return cast(NSScrollerPart) OS.objc_msgSend(this.id_, OS.sel_hitPart);
     }
 
     public CGFloat knobProportion ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_knobProportion);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_knobProportion);
     }
 
     public NSRect rectForPart (NSScrollerPart partCode)
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_rectForPart_1, partCode);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_rectForPart_1, partCode);
         return result;
     }
 
@@ -169,47 +169,47 @@
 
     public void setArrowsPosition (NSScrollArrowPosition where)
     {
-        OS.objc_msgSend(this.id, OS.sel_setArrowsPosition_1, where);
+        OS.objc_msgSend(this.id_, OS.sel_setArrowsPosition_1, where);
     }
 
     public void setControlSize (NSControlSize controlSize)
     {
-        OS.objc_msgSend(this.id, OS.sel_setControlSize_1, controlSize);
+        OS.objc_msgSend(this.id_, OS.sel_setControlSize_1, controlSize);
     }
 
     public void setControlTint (NSControlTint controlTint)
     {
-        OS.objc_msgSend(this.id, OS.sel_setControlTint_1, controlTint);
+        OS.objc_msgSend(this.id_, OS.sel_setControlTint_1, controlTint);
     }
 
     public void setFloatValue (float aFloat, CGFloat proportion)
     {
-        OS.objc_msgSend(this.id, OS.sel_setFloatValue_1knobProportion_1, aFloat, proportion);
+        OS.objc_msgSend(this.id_, OS.sel_setFloatValue_1knobProportion_1, aFloat, proportion);
     }
 
     public void setKnobProportion (CGFloat proportion)
     {
-        OS.objc_msgSend(this.id, OS.sel_setKnobProportion_1, proportion);
+        OS.objc_msgSend(this.id_, OS.sel_setKnobProportion_1, proportion);
     }
 
     public NSScrollerPart testPart (NSPoint thePoint)
     {
-        return cast(NSScrollerPart) OS.objc_msgSend(this.id, OS.sel_testPart_1, thePoint);
+        return cast(NSScrollerPart) OS.objc_msgSend(this.id_, OS.sel_testPart_1, thePoint);
     }
 
     public void trackKnob (NSEvent theEvent)
     {
-        OS.objc_msgSend(this.id, OS.sel_trackKnob_1, theEvent !is null ? theEvent.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_trackKnob_1, theEvent !is null ? theEvent.id_ : null);
     }
 
     public void trackScrollButtons (NSEvent theEvent)
     {
-        OS.objc_msgSend(this.id, OS.sel_trackScrollButtons_1, theEvent !is null ? theEvent.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_trackScrollButtons_1, theEvent !is null ? theEvent.id_ : null);
     }
 
     public NSUsableScrollerParts usableParts ()
     {
-        return cast(NSUsableScrollerParts) OS.objc_msgSend(this.id, OS.sel_usableParts);
+        return cast(NSUsableScrollerParts) OS.objc_msgSend(this.id_, OS.sel_usableParts);
     }
 
 }