--- a/dwt/internal/cocoa/DOMMouseEvent.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/DOMMouseEvent.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,73 +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.DOMMouseEvent;
 
 import dwt.dwthelper.utils;
-import dwt.internal.cocoa.NSObject;
-
-public class DOMMouseEvent : NSObject {
-
-    public this () {
-        super();
-    }
+import cocoa = dwt.internal.cocoa.id;
+import dwt.internal.cocoa.DOMUIEvent;
+import dwt.internal.cocoa.OS;
+import objc = dwt.internal.objc.runtime;
 
-    public this (int id) {
-        super(id);
-    }
+public class DOMMouseEvent : DOMUIEvent {
 
-    public bool altKey () {
-        return OS.objc_msgSend(this.id, OS.sel_altKey) !is 0;
-    }
+public this() {
+    super();
+}
 
-    public short button () {
-        return cast(short) OS.objc_msgSend(this.id, OS.sel_button);
-    }
-
-    public int clientX () {
-        return OS.objc_msgSend(this.id, OS.sel_clientX);
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public int clientY () {
-        return OS.objc_msgSend(this.id, OS.sel_clientY);
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public bool ctrlKey () {
-        return OS.objc_msgSend(this.id, OS.sel_ctrlKey) !is 0;
-    }
+public bool altKey() {
+    return OS.objc_msgSend_bool(this.id, OS.sel_altKey);
+}
 
-    public int detail () {
-        return OS.objc_msgSend(this.id, OS.sel_detail);
-    }
-
-    //public void initMouseEvent_______________(NSString initMouseEvent, bool canBubble, bool cancelable, DOMAbstractView view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, short button, id relatedTarget) {
-    //  OS.objc_msgSend(this.id, OS.sel_initMouseEvent_1_1_1_1_1_1_1_1_1_1_1_1_1_1_1, initMouseEvent !is null ? initMouseEvent.id : 0, canBubble, cancelable, view !is null ? view.id : 0, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget !is null ? relatedTarget.id : 0);
-    //}
+public short button() {
+    return cast(short)OS.objc_msgSend(this.id, OS.sel_button);
+}
 
-    //public void initMouseEvent_canBubble_cancelable_view_detail_screenX_screenY_clientX_clientY_ctrlKey_altKey_shiftKey_metaKey_button_relatedTarget_(NSString type, bool canBubble, bool cancelable, DOMAbstractView view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, short button, id  relatedTarget) {
-    //  OS.objc_msgSend(this.id, OS.sel_initMouseEvent_1canBubble_1cancelable_1view_1detail_1screenX_1screenY_1clientX_1clientY_1ctrlKey_1altKey_1shiftKey_1metaKey_1button_1relatedTarget_1, type !is null ? type.id : 0, canBubble, cancelable, view !is null ? view.id : 0, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget !is null ? relatedTarget.id : 0);
-    //}
+public int clientX() {
+    return cast(int)/*64*/OS.objc_msgSend(this.id, OS.sel_clientX);
+}
 
-    public bool metaKey () {
-        return OS.objc_msgSend(this.id, OS.sel_metaKey) !is 0;
-    }
+public int clientY() {
+    return cast(int)/*64*/OS.objc_msgSend(this.id, OS.sel_clientY);
+}
 
-    public id relatedTarget () {
-        int result = OS.objc_msgSend(this.id, OS.sel_relatedTarget);
-        return result !is 0 ? new id(result) : null;
-    }
+public bool ctrlKey() {
+    return OS.objc_msgSend_bool(this.id, OS.sel_ctrlKey);
+}
 
-    public int screenX () {
-        return OS.objc_msgSend(this.id, OS.sel_screenX);
-    }
+public bool metaKey() {
+    return OS.objc_msgSend_bool(this.id, OS.sel_metaKey);
+}
 
-    public int screenY () {
-        return OS.objc_msgSend(this.id, OS.sel_screenY);
-    }
-
-    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);
+}
 
 }