--- a/dwt/internal/cocoa/DOMWheelEvent.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/DOMWheelEvent.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,60 +1,64 @@
 /*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ *     
  * Port to the D programming language:
- *     Jacob Carlborg <jacob.carlborg@gmail.com>
+ *    Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.internal.cocoa.DOMWheelEvent;
 
 import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSObject;
+import dwt.internal.cocoa.OS;
+import objc = dwt.internal.objc.runtime;
 
 public class DOMWheelEvent : NSObject {
 
-    public this () {
-        super();
-    }
+public this() {
+    super();
+}
 
-    public this (int id) {
-        super(id);
-    }
-
-    public bool altKey () {
-        return OS.objc_msgSend(this.id, OS.sel_altKey) !is 0;
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public int clientX () {
-        return OS.objc_msgSend(this.id, OS.sel_clientX);
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public int clientY () {
-        return OS.objc_msgSend(this.id, OS.sel_clientY);
-    }
+public bool altKey() {
+    return OS.objc_msgSend_bool(this.id, OS.sel_altKey);
+}
 
-    public bool ctrlKey () {
-        return OS.objc_msgSend(this.id, OS.sel_ctrlKey) !is 0;
-    }
+public int clientX() {
+    return cast(int)/*64*/OS.objc_msgSend(this.id, OS.sel_clientX);
+}
 
-    public bool isHorizontal () {
-        return OS.objc_msgSend(this.id, OS.sel_isHorizontal) !is 0;
-    }
+public int clientY() {
+    return cast(int)/*64*/OS.objc_msgSend(this.id, OS.sel_clientY);
+}
 
-    public bool metaKey () {
-        return OS.objc_msgSend(this.id, OS.sel_metaKey) !is 0;
-    }
-
-    public int screenX () {
-        return OS.objc_msgSend(this.id, OS.sel_screenX);
-    }
+public bool ctrlKey() {
+    return OS.objc_msgSend_bool(this.id, OS.sel_ctrlKey);
+}
 
-    public int screenY () {
-        return OS.objc_msgSend(this.id, OS.sel_screenY);
-    }
+public bool metaKey() {
+    return OS.objc_msgSend_bool(this.id, OS.sel_metaKey);
+}
 
-    public bool shiftKey () {
-        return OS.objc_msgSend(this.id, OS.sel_shiftKey) !is 0;
-    }
+public bool shiftKey() {
+    return OS.objc_msgSend_bool(this.id, OS.sel_shiftKey);
+}
 
-    public int wheelDelta () {
-        return OS.objc_msgSend(this.id, OS.sel_wheelDelta);
-    }
+public int wheelDelta() {
+    return cast(int)/*64*/OS.objc_msgSend(this.id, OS.sel_wheelDelta);
+}
 
 }