--- a/dwt/widgets/Widget.d	Tue Dec 09 21:52:21 2008 +0100
+++ b/dwt/widgets/Widget.d	Mon Dec 22 15:10:19 2008 +0100
@@ -173,8 +173,8 @@
 objc.id accessibilityAttributeValue_forParameter(objc.id id, objc.SEL sel, objc.id arg0, objc.id arg1) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    return OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    return OS.objc_msgSendSuper(&super_struct, sel, arg0, arg1);
 }
 
 objc.id accessibilityFocusedUIElement(objc.id id, objc.SEL sel) {
@@ -184,8 +184,8 @@
 objc.id accessibilityHitTest(objc.id id, objc.SEL sel, NSPoint point) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    return OS.objc_msgSendSuper(super_struct, sel, point);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    return OS.objc_msgSendSuper(&super_struct, sel, point);
 }
 
 bool accessibilityIsAttributeSettable(objc.id id, objc.SEL sel, objc.id arg0) {
@@ -221,29 +221,29 @@
 void callSuper(objc.id id, objc.SEL sel, objc.id arg0) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    OS.objc_msgSendSuper(super_struct, sel, arg0);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    OS.objc_msgSendSuper(&super_struct, sel, arg0);
 }
 
 void callSuper(objc.id id, objc.SEL sel, NSRect arg0) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    OS.objc_msgSendSuper(super_struct, sel, arg0);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    OS.objc_msgSendSuper(&super_struct, sel, arg0);
 }
 
 void callSuper(objc.id id, objc.SEL sel, NSRect arg0, objc.id arg1) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    OS.objc_msgSendSuper(&super_struct, sel, arg0, arg1);
 }
 
 bool callSuperBoolean(objc.id id, objc.SEL sel) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    return OS.objc_msgSendSuper(super_struct, sel) !is null;
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    return OS.objc_msgSendSuper(&super_struct, sel) !is null;
 }
 
 bool canBecomeKeyWindow (objc.id id, objc.SEL sel) {
@@ -253,22 +253,22 @@
 bool callSuperBoolean(objc.id id, objc.SEL sel, objc.id arg0) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    return OS.objc_msgSendSuper(super_struct, sel, arg0) !is null;
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    return OS.objc_msgSendSuper(&super_struct, sel, arg0) !is null;
 }
 
 objc.id callSuperObject(objc.id id, objc.SEL sel) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    return OS.objc_msgSendSuper(super_struct, sel);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    return OS.objc_msgSendSuper(&super_struct, sel);
 }
 
 objc.id callSuperObject(objc.id id, objc.SEL sel, objc.id arg0) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    return OS.objc_msgSendSuper(super_struct, sel, arg0);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    return OS.objc_msgSendSuper(&super_struct, sel, arg0);
 }
 
 NSInteger characterIndexForPoint (objc.id id, objc.SEL sel, objc.id point) {
@@ -525,7 +525,7 @@
     /* Do nothing */
 }
 
-void drawInteriorWithFrame_inView (objc.id id, objc.SEL sel, int /*long*/ cellFrame, int /*long*/ view) {
+void drawInteriorWithFrame_inView (objc.id id, objc.SEL sel, objc.id cellFrame, objc.id view) {
 }
 
 void drawRect (objc.id id, objc.SEL sel, NSRect rect) {
@@ -537,9 +537,10 @@
         current.saveGraphicsState();
         path.addClip ();
     }
+    objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    OS.objc_msgSendSuper(super_struct, sel, rect);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    OS.objc_msgSendSuper(&super_struct, sel, rect);
     drawWidget (id, rect);
     if (path !is null) {
         current.restoreGraphicsState();
@@ -562,6 +563,7 @@
 }
 
 int fixMnemonic (char [] buffer) {
+    int i=0, j=0;
     while (i < buffer.length) {
         if ((buffer [j++] = buffer [i++]) is '&') {
             if (i is buffer.length) {continue;}
@@ -733,8 +735,8 @@
 objc.id hitTest (objc.id id, objc.SEL sel, NSPoint point) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    return OS.objc_msgSendSuper(super_struct, sel, point);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    return OS.objc_msgSendSuper(&super_struct, sel, point);
 }
 
 bool hooks (int eventType) {
@@ -858,8 +860,8 @@
 objc.id menuForEvent (objc.id id, objc.SEL sel, objc.id theEvent) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    return OS.objc_msgSendSuper(super_struct, sel, theEvent);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    return OS.objc_msgSendSuper(&super_struct, sel, theEvent);
 }
 
 void menuNeedsUpdate(objc.id id, objc.SEL sel, objc.id menu) {
@@ -870,7 +872,7 @@
 }
 
 NSRange markedRange (objc.id id, objc.SEL sel) {
-    return new NSRange ();
+    return NSRange ();
 }
 
 void menu_willHighlightItem(objc.id id, objc.SEL sel, objc.id menu, objc.id item) {
@@ -882,7 +884,7 @@
 void menuWillOpen(objc.id id, objc.SEL sel, objc.id menu) {
 }
 
-int /*long*/ numberOfRowsInTableView(objc.id id, objc.SEL sel, objc.id aTableView) {
+NSInteger numberOfRowsInTableView(objc.id id, objc.SEL sel, objc.id aTableView) {
     return 0;
 }
 
@@ -893,15 +895,15 @@
 void outlineView_didClickTableColumn(objc.id id, objc.SEL sel, objc.id outlineView, objc.id tableColumn) {
 }
 
-int /*long*/ outlineView_objectValueForTableColumn_byItem(objc.id id, objc.SEL sel, objc.id outlineView, objc.id tableColumn, objc.id item) {
-    return 0;
+objc.id outlineView_objectValueForTableColumn_byItem(objc.id id, objc.SEL sel, objc.id outlineView, objc.id tableColumn, objc.id item) {
+    return null;
 }
 
 bool outlineView_isItemExpandable(objc.id id, objc.SEL sel, objc.id outlineView, objc.id item) {
     return false;
 }
 
-int /*long*/ outlineView_numberOfChildrenOfItem(objc.id id, objc.SEL sel, objc.id outlineView, objc.id item) {
+NSInteger outlineView_numberOfChildrenOfItem(objc.id id, objc.SEL sel, objc.id outlineView, objc.id item) {
     return 0;
 }
 
@@ -1109,7 +1111,7 @@
 }
 
 NSRange selectedRange (objc.id id, objc.SEL sel) {
-    return new NSRange ();
+    return NSRange ();
 }
 
 void sendDoubleSelection() {
@@ -1287,15 +1289,15 @@
 void setFrameOrigin (objc.id id, objc.SEL sel, NSPoint point) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    OS.objc_msgSendSuper(super_struct, sel, point);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    OS.objc_msgSendSuper(&super_struct, sel, point);
 }
 
 void setFrameSize (objc.id id, objc.SEL sel, NSSize size) {
     objc_super super_struct = objc_super();
     super_struct.receiver = id;
-    super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-    OS.objc_msgSendSuper(super_struct, sel, size);
+    super_struct.super_class = cast(objc.Class) OS.objc_msgSend(id, OS.sel_superclass);
+    OS.objc_msgSendSuper(&super_struct, sel, size);
 }
 
 bool setInputState (Event event, NSEvent nsEvent, int type) {