--- a/dwt/widgets/Control.d	Mon Dec 01 17:07:00 2008 +0100
+++ b/dwt/widgets/Control.d	Fri Dec 05 16:00:41 2008 +0100
@@ -59,7 +59,7 @@
 import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.NSView;
 import dwt.internal.cocoa.OS;
-import dwt.internal.cocoa.id;
+import cocoa = dwt.internal.cocoa.id;
 
 import tango.core.Thread;
 
@@ -171,18 +171,18 @@
     createWidget ();
 }
 
-int accessibilityActionNames(int /*long*/ id, int /*long*/ sel) {
+objc.id accessibilityActionNames(objc.id id, objc.SEL sel) {
     if (accessible !is null) {
         NSArray returnValue = accessible.internal_accessibilityActionNames(ACC.CHILDID_SELF);
-        if (returnValue !is null) return returnValue.id_;
+        if (returnValue !is null) return returnValue.id;
     }
     
     return super.accessibilityActionNames(id, sel);
 }
 
-int accessibilityAttributeNames(objc.id id, objc.SEL sel) {
+objc.id accessibilityAttributeNames(objc.id id, objc.SEL sel) {
     
-    if (id is view.id_ || (cast(NSControl)view && (cast(NSControl)view).cell() !is null && (cast(NSControl)view).cell().id_ is id)) {
+    if (id is view.id || (cast(NSControl)view && (cast(NSControl)view).cell() !is null && (cast(NSControl)view).cell().id is id)) {
         if (accessible !is null) {
             
             // First, see if the accessible is going to define a set of attributes for the control.
@@ -205,13 +205,13 @@
             }
 
             if (extraAttributes.count() > 0) {
-                int superResult = super.accessibilityAttributeNames(id, sel);
+                objc.id superResult = super.accessibilityAttributeNames(id, sel);
                 NSArray baseAttributes = new NSArray(superResult);
                 NSMutableArray mutableAttributes = NSMutableArray.arrayWithCapacity(baseAttributes.count() + 1);
                 mutableAttributes.addObjectsFromArray(baseAttributes);
                 
                 for (int i = 0; i < extraAttributes.count(); i++) {
-                    id currAttribute = extraAttributes.objectAtIndex(i);
+                    cocoa.id currAttribute = extraAttributes.objectAtIndex(i);
                     if (!mutableAttributes.containsObject(currAttribute)) {
                         mutableAttributes.addObject(currAttribute);
                     }
@@ -225,9 +225,9 @@
     return super.accessibilityAttributeNames(id, sel);
 }
 
-int accessibilityParameterizedAttributeNames(int /*long*/ id, int /*long*/ sel) {
+objc.id accessibilityParameterizedAttributeNames(objc.id id, objc.SEL sel) {
 
-    if (id is view.id || (view instanceof NSControl && ((NSControl)view).cell() !is null && ((NSControl)view).cell().id is id)) {
+    if (id is view.id || (cast(NSControl)view && (cast(NSControl)view).cell() !is null && (cast(NSControl)view).cell().id is id)) {
         if (accessible !is null) {
             NSArray returnValue = accessible.internal_accessibilityParameterizedAttributeNames(ACC.CHILDID_SELF);
             if (returnValue !is null) return returnValue.id;
@@ -238,7 +238,7 @@
 }
 
 
-bool accessibilityIsAttributeSettable(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+bool accessibilityIsAttributeSettable(objc.id id, objc.SEL sel, int /*long*/ arg0) {
 
     // TODO: Carbon didn't support setting attributes, so for now Cocoa doesn't as well.
     //  NSString attribute = new NSString(arg0);
@@ -251,10 +251,10 @@
     return false;
 }
 
-int accessibilityFocusedUIElement(int /*long*/ id, int /*long*/ sel) {
-    id returnValue = null;
+objc.id accessibilityFocusedUIElement(objc.id id, objc.SEL sel) {
+    cocoa.id returnValue = null;
 
-    if (id is view.id || (view instanceof NSControl && ((NSControl)view).cell() !is null && ((NSControl)view).cell().id is id)) {
+    if (id is view.id || (cast(NSControl)view && (cast(NSControl)view).cell() !is null && (cast(NSControl)view).cell().id is id)) {
         if (accessible !is null) {
             returnValue = accessible.internal_accessibilityFocusedUIElement(ACC.CHILDID_SELF);
         }
@@ -268,10 +268,10 @@
         return returnValue.id;
 }
 
-int accessibilityHitTest(int /*long*/ id, int /*long*/ sel, NSPoint point) {
-    id returnValue = null;
+objc.id accessibilityHitTest(objc.id id, objc.SEL sel, NSPoint point) {
+    cocoa.id returnValue = null;
 
-    if (id is view.id || (view instanceof NSControl && ((NSControl)view).cell() !is null && ((NSControl)view).cell().id is id)) {
+    if (id is view.id || (cast(NSControl)view && (cast(NSControl)view).cell() !is null && (cast(NSControl)view).cell().id is id)) {
         if (accessible !is null) {
             returnValue = accessible.internal_accessibilityHitTest(point, ACC.CHILDID_SELF);
         }
@@ -285,10 +285,10 @@
         return returnValue.id;
 }
 
-int accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+objc.id accessibilityAttributeValue(objc.id id, objc.SEL sel, objc.id arg0) {
     NSString attribute = new NSString(arg0);
-    int returnValue = 0;
-    id returnObject = null;
+    objc.id returnValue = null;
+    cocoa.id returnObject = null;
     
     if (accessible !is null) {
         returnObject = accessible.internal_accessibilityAttributeValue(attribute, ACC.CHILDID_SELF);
@@ -305,13 +305,13 @@
     return returnValue;
 }
 
-int accessibilityAttributeValue_forParameter(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+objc.id accessibilityAttributeValue_forParameter(objc.id id, objc.SEL sel, objc.id arg0, objc.id arg1) {
     NSString attribute = new NSString(arg0);
     
-    id returnValue = null;
+    cocoa.id returnValue = null;
     
     if (accessible !is null) {
-        id parameter = new id(arg1);
+        cocoa.id parameter = new cocoa.id(arg1);
         returnValue = accessible.internal_accessibilityAttributeValue_forParameter(attribute, parameter, ACC.CHILDID_SELF);
     }
     
@@ -850,7 +850,7 @@
     releaseHandle ();
 }
 
-void doCommandBySelector (int /*long*/ id, int /*long*/ sel, int /*long*/ selector) {
+void doCommandBySelector (objc.id id, objc.SEL sel, int /*long*/ selector) {
     if (view.window ().firstResponder ().id is id) {
         NSEvent nsEvent = NSApplication.sharedApplication ().currentEvent ();
         if (nsEvent !is null && nsEvent.type () is OS.NSKeyDown) {
@@ -1006,7 +1006,7 @@
     if (image !is null && !image.isDisposed()) {
         context.saveGraphicsState();
         NSColor.colorWithPatternImage(image.handle).setFill();
-        NSPoint phase = new NSPoint();
+        NSPoint phase = NSPoint();
         NSView controlView = control.view;
         NSView contentView = controlView.window().contentView();
         phase = controlView.convertPoint_toView_(phase, contentView);
@@ -1058,7 +1058,7 @@
 //  OS.ClearKeyboardFocus (window);
 }
 
-void flagsChanged (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void flagsChanged (objc.id id, objc.SEL sel, int /*long*/ theEvent) {
     if (view.window ().firstResponder ().id is id) {
         if ((state & SAFARI_EVENTS_FIX) is 0) {
             int mask = 0;
@@ -1555,12 +1555,12 @@
     return (view.window().firstResponder().id is view.id);
 }
 
-int /*long*/ hitTest (int /*long*/ id, int /*long*/ sel, NSPoint point) {
+int /*long*/ hitTest (objc.id id, objc.SEL sel, NSPoint point) {
     if ((state & DISABLED) !is 0) return 0;
     return super.hitTest(id, sel, point);
 }
 
-bool insertText (int /*long*/ id, int /*long*/ sel, int /*long*/ string) {
+bool insertText (objc.id id, objc.SEL sel, int /*long*/ string) {
     if (view.window ().firstResponder ().id is id) {
         NSEvent nsEvent = NSApplication.sharedApplication ().currentEvent ();
         if (nsEvent !is null && nsEvent.type () is OS.NSKeyDown) {
@@ -1600,11 +1600,11 @@
     checkWidget();
     objc.id context = null;
     if (data !is null && data.paintRect !is null) {
-        context = NSGraphicsContext.currentContext().id_;
+        context = NSGraphicsContext.currentContext().id;
     } else {
         NSGraphicsContext graphicsContext = NSGraphicsContext.graphicsContextWithWindow (view.window ());
         display.addContext (graphicsContext);
-        context = graphicsContext.id_;
+        context = graphicsContext.id;
     }
     if (data !is null) {
         int mask = DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT;
@@ -1777,7 +1777,7 @@
 }
 
 void keyDown (objc.id id, objc.SEL sel, objc.id theEvent) {
-    if (view.window ().firstResponder ().id_ is id) {
+    if (view.window ().firstResponder ().id is id) {
         bool textInput = OS.objc_msgSend (id, OS.sel_conformsToProtocol_, OS.objc_getProtocol ("NSTextInput")) !is null;
         if (!textInput) {
             NSEvent nsEvent = new NSEvent (theEvent);
@@ -1791,7 +1791,7 @@
     super.keyDown (id, sel, theEvent);
 }
 
-void keyUp (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void keyUp (objc.id id, objc.SEL sel, int /*long*/ theEvent) {
     if (view.window ().firstResponder ().id is id) {
         NSEvent nsEvent = new NSEvent (theEvent);
         if (!sendKeyEvent (nsEvent, DWT.KeyUp)) return;
@@ -1803,7 +1803,7 @@
     /* Do nothing */
 }
 
-int /*long*/ menuForEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+int /*long*/ menuForEvent (objc.id id, objc.SEL sel, int /*long*/ theEvent) {
     NSPoint pt = NSEvent.mouseLocation();
     pt.y = (int) (display.getPrimaryFrame().height - pt.y);
     int x = cast(int) pt.x;
@@ -1818,7 +1818,7 @@
         if (x !is event.x || y !is event.y) {
             menu.setLocation (event.x, event.y);
         }
-        return menu.nsMenu.id_;
+        return menu.nsMenu.id;
     }
     return super.menuForEvent (id, sel, theEvent);
 }
@@ -1827,7 +1827,7 @@
     return parent.menuShell ();
 }
 
-void scrollWheel (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void scrollWheel (objc.id id, objc.SEL sel, int /*long*/ theEvent) {
     if (id is view.id) {
         if (hooks (DWT.MouseWheel) || filters (DWT.MouseWheel)) {
             NSEvent nsEvent = new NSEvent(theEvent);
@@ -1841,7 +1841,7 @@
     super.scrollWheel(id, sel, theEvent);
 }
 
-void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDown(objc.id id, objc.SEL sel, int /*long*/ theEvent) {
     Display display = this.display;
     display.trackingControl = this;
     super.mouseDown(id, sel, theEvent);
@@ -2610,7 +2610,7 @@
 void setBounds (int x, int y, int width, int height, bool move, bool resize) {
     NSView topView = topView();
     if (move && resize) {
-        NSRect rect = new NSRect();
+        NSRect rect = NSRect();
         rect.x = x;
         rect.y = y;
         rect.width = width;
@@ -2851,7 +2851,7 @@
 //  OS.SetControlFontStyle (control, fontStyle);
 }
 
-void setFrameOrigin (int /*long*/ id, int /*long*/ sel, NSPoint point) {
+void setFrameOrigin (objc.id id, objc.SEL sel, NSPoint point) {
     NSView topView = topView ();
     if (topView.id !is id) {
         super.setFrameOrigin(id, sel, point);
@@ -2864,7 +2864,7 @@
     }
 }
 
-void setFrameSize (int /*long*/ id, int /*long*/ sel, NSSize size) {
+void setFrameSize (objc.id id, objc.SEL sel, NSSize size) {
     NSView topView = topView ();
     if (topView.id !is id) {
         super.setFrameSize(id, sel, size);