--- a/dwt/widgets/Tree.d	Wed Aug 27 14:10:03 2008 +0200
+++ b/dwt/widgets/Tree.d	Wed Aug 27 14:30:35 2008 +0200
@@ -59,7 +59,7 @@
  *  tree.setItemCount(20);
  *  tree.addListener(DWT.SetData, new Listener() {
  *      public void handleEvent(Event event) {
- *          TreeItem item = (TreeItem)event.item;
+ *          TreeItem item = cast(TreeItem)event.item;
  *          TreeItem parentItem = item.getParentItem();
  *          String text = null;
  *          if (parentItem is null) {
@@ -362,7 +362,7 @@
 //          if (OS.VERSION >= 0x1040) {
 //              float [] metric = new float [1];
 //              OS.DataBrowserGetMetric (handle, OS.kDataBrowserMetricDisclosureColumnPerDepthGap, null, metric);
-//              levelIndent = (int) metric [0];
+//              levelIndent = cast(int) metric [0];
 //          }
 //          GC gc = new GC (this);
 //          width = calculateWidth (childIds, gc, true, 0, levelIndent);
@@ -374,7 +374,7 @@
         width = wHint;
     }
     if (hHint is DWT.DEFAULT) {
-        height = ((NSTableView)view).numberOfRows() * getItemHeight () + getHeaderHeight();
+        height = (cast(NSTableView)view).numberOfRows() * getItemHeight () + getHeaderHeight();
     } else {
         height = hHint;
     }
@@ -385,7 +385,7 @@
 }
 
 void createHandle () {
-    SWTScrollView scrollWidget = (SWTScrollView)new SWTScrollView().alloc();
+    SWTScrollView scrollWidget = cast(SWTScrollView)new SWTScrollView().alloc();
     scrollWidget.initWithFrame(new NSRect ());
     scrollWidget.setHasHorizontalScroller(true);
     scrollWidget.setHasVerticalScroller(true);
@@ -393,7 +393,7 @@
     scrollWidget.setBorderType(hasBorder() ? OS.NSBezelBorder : OS.NSNoBorder);
     scrollWidget.setTag(jniRef);
     
-    NSOutlineView widget = (NSOutlineView)new SWTOutlineView().alloc();
+    NSOutlineView widget = cast(NSOutlineView)new SWTOutlineView().alloc();
     widget.initWithFrame(new NSRect());
     widget.setAllowsMultipleSelection((style & DWT.MULTI) !is 0);
     widget.setAutoresizesOutlineColumn(false);
@@ -410,12 +410,12 @@
     
     NSString str = NSString.stringWith("");
     if ((style & DWT.CHECK) !is 0) {
-        checkColumn = (NSTableColumn)new NSTableColumn().alloc();
+        checkColumn = cast(NSTableColumn)new NSTableColumn().alloc();
         checkColumn.initWithIdentifier(str);
         checkColumn.headerCell().setTitle(str);
         widget.addTableColumn (checkColumn);
         widget.setOutlineTableColumn(checkColumn);
-        NSButtonCell cell = (NSButtonCell)new NSButtonCell().alloc().init();
+        NSButtonCell cell = cast(NSButtonCell)new NSButtonCell().alloc().init();
         checkColumn.setDataCell(cell);
         cell.setButtonType(OS.NSSwitchButton);
         cell.setImagePosition(OS.NSImageOnly);
@@ -426,12 +426,12 @@
         cell.release();
     }
     
-    firstColumn = (NSTableColumn)new NSTableColumn().alloc();
+    firstColumn = cast(NSTableColumn)new NSTableColumn().alloc();
     firstColumn.initWithIdentifier(str);
     firstColumn.headerCell().setTitle(str);
     widget.addTableColumn (firstColumn);
     widget.setOutlineTableColumn(firstColumn);
-    NSBrowserCell cell = (NSBrowserCell)new NSBrowserCell().alloc().init();
+    NSBrowserCell cell = cast(NSBrowserCell)new NSBrowserCell().alloc().init();
     cell.setLeaf(true);
     firstColumn.setDataCell(cell);
     cell.release();
@@ -462,13 +462,13 @@
     } else {
         //TODO - set attributes, alignment etc.
         NSString str = NSString.stringWith("");
-        nsColumn = (NSTableColumn)new NSTableColumn().alloc();
+        nsColumn = cast(NSTableColumn)new NSTableColumn().alloc();
         nsColumn.initWithIdentifier(str);
         nsColumn.headerCell().setTitle(str);
-        ((NSTableView)view).addTableColumn (nsColumn);
+        (cast(NSTableView)view).addTableColumn (nsColumn);
         int checkColumn = (style & DWT.CHECK) !is 0 ? 1 : 0;
-        ((NSTableView)view).moveColumn (columnCount + checkColumn, index + checkColumn);
-        NSBrowserCell cell = (NSBrowserCell)new NSBrowserCell().alloc().init();
+        (cast(NSTableView)view).moveColumn (columnCount + checkColumn, index + checkColumn);
+        NSBrowserCell cell = cast(NSBrowserCell)new NSBrowserCell().alloc().init();
         cell.setLeaf(true);
         nsColumn.setDataCell(cell);
         cell.release();
@@ -551,7 +551,7 @@
     items [index] = item;
     item.items = new TreeItem[4];
     item.createJNIRef();
-    SWTTreeItem handle = (SWTTreeItem)new SWTTreeItem().alloc().init();
+    SWTTreeItem handle = cast(SWTTreeItem)new SWTTreeItem().alloc().init();
     handle.setTag(item.jniRef);
     item.handle = handle;
     if (parentItem !is null) {
@@ -560,7 +560,7 @@
         this.itemCount = count;
     }
     //TODO ?
-    ((NSTableView)view).reloadData();
+    (cast(NSTableView)view).reloadData();
 }
 
 void createWidget () {
@@ -587,7 +587,7 @@
  */
 public void deselectAll () {
     checkWidget ();
-    NSTableView widget = (NSTableView)view;
+    NSTableView widget = cast(NSTableView)view;
     ignoreSelect = true;
     widget.deselectAll(null);
     ignoreSelect = false;
@@ -737,10 +737,10 @@
     items [count] = null;
     if (parentItem !is null) {
         parentItem.itemCount = count;
-        ((NSOutlineView)view).reloadItem_reloadChildren_(parentItem.handle, true);
+        (cast(NSOutlineView)view).reloadItem_reloadChildren_(parentItem.handle, true);
     } else {
         this.itemCount = count;
-        ((NSOutlineView)view).reloadItem_(null);
+        (cast(NSOutlineView)view).reloadItem_(null);
     }
     
     //noteNumberOfRowsChanged was causing crashes whenever
@@ -749,7 +749,7 @@
     //Not sure that this NSTableView function 
     //makes sense in an NSOutlineView.
     
-    //((NSTableView)view).noteNumberOfRowsChanged();
+    //(cast(NSTableView)view).noteNumberOfRowsChanged();
     
 //  setScrollWidth (true);
 //  fixScrollBar ();
@@ -939,9 +939,9 @@
  */
 public int getHeaderHeight () {
     checkWidget ();
-    NSTableHeaderView headerView = ((NSTableView)view).headerView();
+    NSTableHeaderView headerView = (cast(NSTableView)view).headerView();
     if (headerView is null) return 0;
-    return (int)headerView.bounds().height;
+    return cast(int)headerView.bounds().height;
 }
 
 /**
@@ -965,7 +965,7 @@
  */
 public bool getHeaderVisible () {
     checkWidget ();
-    return ((NSTableView)view).headerView() !is null;
+    return (cast(NSTableView)view).headerView() !is null;
 }
 
 /**
@@ -1020,7 +1020,7 @@
     if (point is null) error (DWT.ERROR_NULL_ARGUMENT);
 //  Rect rect = new Rect ();
 //  dwt.internal.carbon.Point pt = new dwt.internal.carbon.Point ();
-//  OS.SetPt (pt, (short) point.x, (short) point.y);
+//  OS.SetPt (pt, cast(short) point.x, cast(short) point.y);
 //  if (0 < lastHittest && lastHittest <= items.length && lastHittestColumn !is 0) {
 //      TreeItem item = _getItem (lastHittest, false);
 //      if (item !is null) {
@@ -1104,7 +1104,7 @@
  */
 public int getItemHeight () {
     checkWidget ();
-    return (int)((NSTableView)view).rowHeight();
+    return cast(int)(cast(NSTableView)view).rowHeight();
 }
 
 /**
@@ -1197,7 +1197,7 @@
  */
 public TreeItem [] getSelection () {
     checkWidget ();
-    NSOutlineView widget = (NSOutlineView)view;
+    NSOutlineView widget = cast(NSOutlineView)view;
     if (widget.numberOfSelectedRows() is 0) {
         return new TreeItem [0];
     }
@@ -1211,7 +1211,7 @@
         int jniRef = OS.objc_msgSend(item.id, OS.sel_tag);
         if (jniRef !is -1 && jniRef !is 0) {
             //TODO virtual
-            result[i] = (TreeItem)OS.JNIGetObject(jniRef);
+            result[i] = cast(TreeItem)OS.JNIGetObject(jniRef);
         }
     }
     return result;
@@ -1229,7 +1229,7 @@
  */
 public int getSelectionCount () {
     checkWidget ();
-    return ((NSTableView)view).numberOfSelectedRows();
+    return (cast(NSTableView)view).numberOfSelectedRows();
 }
 
 /**
@@ -1367,13 +1367,13 @@
 
 int outlineView_child_ofItem(int outlineView, int index, int ref) {
     TreeItem parent = null;
-    if (ref !is 0) parent = (TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
+    if (ref !is 0) parent = cast(TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
     TreeItem item = _getItem(parent, index);
     return item.handle.id;
 }
 
 int outlineView_objectValueForTableColumn_byItem(int outlineView, int tableColumn, int ref) {
-    TreeItem item = (TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
+    TreeItem item = cast(TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
     if (checkColumn !is null && tableColumn is checkColumn.id) {
         NSNumber value;
         if (item.checked && item.grayed) {
@@ -1393,17 +1393,17 @@
 
 bool outlineView_isItemExpandable(int outlineView, int ref) {
     if (ref is 0) return true;
-    return ((TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag))).itemCount !is 0;
+    return (cast(TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag))).itemCount !is 0;
 }
 
 int outlineView_numberOfChildrenOfItem(int outlineView, int ref) {
     if (ref is 0) return itemCount;
-    return ((TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag))).itemCount;
+    return (cast(TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag))).itemCount;
 }
 
 void outlineView_willDisplayCell_forTableColumn_item(int outlineView, int cell, int tableColumn, int ref) {
     if (checkColumn !is null && tableColumn is checkColumn.id) return;
-    TreeItem item = (TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
+    TreeItem item = cast(TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
     Image image = item.image;
     for (int i=0; i<columnCount; i++) {
         if (columns [i].nsColumn.id is tableColumn) {
@@ -1416,13 +1416,13 @@
 
 void outlineViewSelectionDidChange(int notification) {
     if (ignoreSelect) return;
-    NSOutlineView widget = (NSOutlineView)view;
+    NSOutlineView widget = cast(NSOutlineView)view;
     int row = widget.selectedRow();
     if(row is -1)
         postEvent(DWT.Selection);
     else {
         id _id = widget.itemAtRow(row);
-        TreeItem item = (TreeItem)OS.JNIGetObject(OS.objc_msgSend(_id.id, OS.sel_tag));
+        TreeItem item = cast(TreeItem)OS.JNIGetObject(OS.objc_msgSend(_id.id, OS.sel_tag));
         Event event = new Event();
         event.item = item;
         event.index = row;
@@ -1432,7 +1432,7 @@
 
 bool outlineView_shouldCollapseItem(int outlineView, int ref) {
     if (!ignoreExpand) {
-        TreeItem item = (TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
+        TreeItem item = cast(TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
         Event event = new Event();
         event.item = item;
         sendEvent(DWT.Collapse, event);
@@ -1443,7 +1443,7 @@
 
 bool outlineView_shouldExpandItem(int outlineView, int ref) {
     if (!ignoreExpand) {
-        TreeItem item = (TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
+        TreeItem item = cast(TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
         Event event = new Event();
         event.item = item;
         sendEvent(DWT.Expand, event);
@@ -1453,7 +1453,7 @@
 }
 
 void outlineView_setObjectValue_forTableColumn_byItem(int outlineView, int object, int tableColumn, int ref) {
-    TreeItem item = (TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
+    TreeItem item = cast(TreeItem)OS.JNIGetObject(OS.objc_msgSend(ref, OS.sel_tag));
     if (checkColumn !is null && tableColumn is checkColumn.id)  {
         item.checked = !item.checked;
         Event event = new Event();
@@ -1515,8 +1515,8 @@
     }
     items = new TreeItem [4];
     itemCount = 0;
-    ((NSOutlineView)view).reloadItem_(null);
-    //((NSTableView)view).noteNumberOfRowsChanged();
+    (cast(NSOutlineView)view).reloadItem_(null);
+    //(cast(NSTableView)view).noteNumberOfRowsChanged();
 //  setScrollWidth (true);
 }
 
@@ -1607,7 +1607,7 @@
 public void selectAll () {
     checkWidget ();
     if ((style & DWT.SINGLE) !is 0) return;
-    NSTableView widget = (NSTableView)view;
+    NSTableView widget = cast(NSTableView)view;
     ignoreSelect = true;
     widget.selectAll(null);
     ignoreSelect = false;
@@ -1750,7 +1750,7 @@
  */
 public void setHeaderVisible (bool show) {
     checkWidget ();
-    ((NSTableView)view).setHeaderView (show ? headerView : null);
+    (cast(NSTableView)view).setHeaderView (show ? headerView : null);
 }
 
 /**
@@ -1865,7 +1865,7 @@
     if (itemHeight is -1) {
         //TODO - reset item height, ensure other API's such as setFont don't do this
     } else {
-//      OS.SetDataBrowserTableViewRowHeight (handle, (short) itemHeight);
+//      OS.SetDataBrowserTableViewRowHeight (handle, cast(short) itemHeight);
     }
 }
 
@@ -1876,7 +1876,7 @@
 //  short [] height = new short [1];
 //  if (OS.GetDataBrowserTableViewRowHeight (handle, height) is OS.noErr) {
 //      if (height [0] < bounds.height) {
-//          OS.SetDataBrowserTableViewRowHeight (handle, (short) bounds.height);
+//          OS.SetDataBrowserTableViewRowHeight (handle, cast(short) bounds.height);
 //      }
 //  }
 }
@@ -1901,7 +1901,7 @@
  */
 public void setLinesVisible (bool show) {
     checkWidget ();
-    ((NSTableView)view).setUsesAlternatingRowBackgroundColors(show);
+    (cast(NSTableView)view).setUsesAlternatingRowBackgroundColors(show);
 }
 
 public void setRedraw (bool redraw) {
@@ -1924,7 +1924,7 @@
 //  short [] width = new short [1];
 //  OS.GetDataBrowserTableViewNamedColumnWidth (handle, column_id, width);
 //  if (width [0] < newWidth) {
-//      OS.SetDataBrowserTableViewNamedColumnWidth (handle, column_id, (short) newWidth);
+//      OS.SetDataBrowserTableViewNamedColumnWidth (handle, column_id, cast(short) newWidth);
 //      return true;
 //  }
 //  firstColumn.setWidth(400);
@@ -1948,7 +1948,7 @@
 //      OS.GetDataBrowserTableViewNamedColumnWidth (handle, column_id, width);
 //      if (width [0] >= newWidth) return false;
 //  }
-//  OS.SetDataBrowserTableViewNamedColumnWidth (handle, column_id, (short) newWidth);
+//  OS.SetDataBrowserTableViewNamedColumnWidth (handle, column_id, cast(short) newWidth);
     return true;
 }
 
@@ -2071,7 +2071,7 @@
     if (column is sortColumn) return;
 //  if (column is null) {
 //      if (sortColumn !is null  && !sortColumn.isDisposed ()  && sortDirection !is DWT.NONE) {
-//          OS.SetDataBrowserSortOrder (handle, (short) OS.kDataBrowserOrderIncreasing);
+//          OS.SetDataBrowserSortOrder (handle, cast(short) OS.kDataBrowserOrderIncreasing);
 //          sortColumn = null; 
 //          OS.SetDataBrowserSortProperty (handle, 0);
 //      }
@@ -2080,7 +2080,7 @@
 //  if (sortColumn !is null  && !sortColumn.isDisposed () && sortDirection !is DWT.NONE) {
 //      OS.SetDataBrowserSortProperty (handle, sortColumn.id);
 //      int order = sortDirection is DWT.DOWN ? OS.kDataBrowserOrderDecreasing : OS.kDataBrowserOrderIncreasing;
-//      OS.SetDataBrowserSortOrder (handle, (short) order);
+//      OS.SetDataBrowserSortOrder (handle, cast(short) order);
 //  }
 }
 
@@ -2104,7 +2104,7 @@
 //  sortDirection = direction;
 //  if (sortColumn !is null && !sortColumn.isDisposed ()) {
 //      if (sortDirection is DWT.NONE) {
-//          OS.SetDataBrowserSortOrder (handle, (short) OS.kDataBrowserOrderIncreasing);
+//          OS.SetDataBrowserSortOrder (handle, cast(short) OS.kDataBrowserOrderIncreasing);
 //          TreeColumn column = sortColumn;
 //          sortColumn = null; 
 //          OS.SetDataBrowserSortProperty (handle, 0);
@@ -2113,7 +2113,7 @@
 //          OS.SetDataBrowserSortProperty (handle, 0);
 //          OS.SetDataBrowserSortProperty (handle, sortColumn.id);
 //          int order = sortDirection is DWT.DOWN ? OS.kDataBrowserOrderDecreasing : OS.kDataBrowserOrderIncreasing;
-//          OS.SetDataBrowserSortOrder (handle, (short) order);
+//          OS.SetDataBrowserSortOrder (handle, cast(short) order);
 //      }
 //  }
 }
@@ -2144,7 +2144,7 @@
     if (item.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
 //  showItem (item, false);
 //  int columnId = (columnCount is 0) ? column_id : columns [0].id;
-//  OS.RevealDataBrowserItem (handle, item.id, columnId, (byte) OS.kDataBrowserRevealWithoutSelecting);
+//  OS.RevealDataBrowserItem (handle, item.id, columnId, cast(byte) OS.kDataBrowserRevealWithoutSelecting);
 //  Rect rect = new Rect ();
 //  if (OS.GetDataBrowserItemPartBounds (handle, item.id, column_id, OS.kDataBrowserPropertyEnclosingPart, rect) is OS.noErr) {
 //      int border = getBorder ();
@@ -2179,7 +2179,7 @@
     if (column.parent !is this) return;
     int index = indexOf (column);
     if (columnCount <= 1 || !(0 <= index && index < columnCount)) return;
-    ((NSTableView)view).scrollColumnToVisible(index + ((style & DWT.CHECK) !is 0 ? 1 : 0));
+    (cast(NSTableView)view).scrollColumnToVisible(index + ((style & DWT.CHECK) !is 0 ? 1 : 0));
 }
 
 /**
@@ -2260,7 +2260,7 @@
 //      * end in some cases).
 //      */
 //      //options |= OS.kDataBrowserRevealAndCenterInView;
-//      OS.RevealDataBrowserItem (handle, item.id, columnId, (byte) options);
+//      OS.RevealDataBrowserItem (handle, item.id, columnId, cast(byte) options);
 //      int [] newTop = new int [1], newLeft = new int [1];
 //      if (columnCount is 0) {
 //          bool fixScroll = false;
@@ -2280,7 +2280,7 @@
 //              if (OS.VERSION >= 0x1040) {
 //                  float [] metric = new float [1];
 //                  OS.DataBrowserGetMetric (handle, OS.kDataBrowserMetricDisclosureColumnPerDepthGap, null, metric);
-//                  levelIndent = (int) metric [0];
+//                  levelIndent = cast(int) metric [0];
 //              }
 //              TreeItem temp = item;
 //              while (temp.parentItem !is null) {