--- a/dwt/widgets/ToolBar.d	Sun Dec 28 19:28:22 2008 +0100
+++ b/dwt/widgets/ToolBar.d	Sun Dec 28 19:37:49 2008 +0100
@@ -7,6 +7,9 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     
+ * Port to the D programming language:
+ *     Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.widgets.ToolBar;
 
@@ -28,7 +31,12 @@
 import dwt.internal.cocoa.NSView;
 import dwt.internal.cocoa.OS;
 import dwt.internal.cocoa.SWTView;
-import dwt.internal.cocoa.id;
+import cocoa = dwt.internal.cocoa.id;
+
+import objc = dwt.internal.objc.runtime;
+import dwt.widgets.Composite;
+import dwt.widgets.Control;
+import dwt.widgets.ToolItem;
 
 /**
  * Instances of this class support the layout of selectable
@@ -113,7 +121,7 @@
     }
 }
 
-int accessibilityAttributeNames(int /*long*/ id, int /*long*/ sel) {
+objc.id accessibilityAttributeNames(objc.id id, objc.SEL sel) {
     
     if (accessibilityAttributes is null) {
         NSMutableArray ourAttributes = NSMutableArray.arrayWithCapacity(10);
@@ -152,11 +160,11 @@
     return accessibilityAttributes.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 nsAttributeName = new NSString(arg0);
     
     if (accessible !is null) {
-        id returnObject = accessible.internal_accessibilityAttributeValue(nsAttributeName, ACC.CHILDID_SELF);
+        cocoa.id returnObject = accessible.internal_accessibilityAttributeValue(nsAttributeName, ACC.CHILDID_SELF);
         if (returnObject !is null) return returnObject.id;
     }
     
@@ -166,7 +174,7 @@
         if (nsAttributeName.isEqualToString (OS.NSAccessibilityRoleAttribute))
             return role.id;
         else {
-            int roleDescription = OS.NSAccessibilityRoleDescription(role.id, 0);
+            objc.id roleDescription = OS.NSAccessibilityRoleDescription(role.id, null);
             return roleDescription;
         }
     } else if (nsAttributeName.isEqualToString(OS.NSAccessibilityEnabledAttribute)) {
@@ -179,7 +187,7 @@
     return super.accessibilityAttributeValue(id, sel, arg0);
 }
 
-bool accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+bool accessibilityIsIgnored(objc.id id, objc.SELs sel) {
     // Toolbars aren't ignored.
     return false;   
 }
@@ -212,7 +220,7 @@
 }
 
 void createHandle () {
-    NSView widget = cast(NSView)new SWTView().alloc();
+    NSView widget = cast(NSView)(new SWTView()).alloc();
     widget.initWithFrame(NSRect());
 //  widget.setDrawsBackground(false);
     view = widget;
@@ -436,7 +444,7 @@
         maxX = Math.max (maxX, x);
     }
     
-    return new int [] {rows, maxX, y + itemHeight};
+    return [rows, maxX, y + itemHeight];
 }
 
 int [] layoutVertical (int width, int height, bool resize) {
@@ -473,7 +481,7 @@
         maxY = Math.max (maxY, y);
     }
     
-    return new int [] {cols, x + itemWidth, maxY};
+    return [cols, x + itemWidth, maxY];
 }
 
 int [] layout (int nWidth, int nHeight, bool resize) {
@@ -526,7 +534,7 @@
 void setFont(NSFont font) {
     for (int i = 0; i < itemCount; i++) {
         ToolItem item = items[i];
-        if (item.button !is null) ((NSButton)item.button).setAttributedTitle(item.createString());
+        if (item.button !is null) (cast(NSButton)item.button).setAttributedTitle(item.createString());
     }
 }