--- a/dwt/internal/cocoa/DOMKeyboardEvent.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/DOMKeyboardEvent.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,57 +1,60 @@
 /*******************************************************************************
+ * 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.DOMKeyboardEvent;
 
-import dwt.internal.cocoa.NSObject;
-import dwt.internal.cocoa.NSString;
+import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
+import dwt.internal.cocoa.DOMUIEvent;
 import dwt.internal.cocoa.OS;
+import objc = dwt.internal.objc.runtime;
 
-public class DOMKeyboardEvent : NSObject {
-
-    public this () {
-        super();
-    }
+public class DOMKeyboardEvent : DOMUIEvent {
 
-    public this (int id) {
-        super(id);
-    }
+public this() {
+    super();
+}
 
-    public bool altKey () {
-        return OS.objc_msgSend(this.id, OS.sel_altKey) !is 0;
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public int charCode () {
-        return OS.objc_msgSend(this.id, OS.sel_charCode);
-    }
+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 bool getModifierState (NSString keyIdentifierArg) {
-        return OS.objc_msgSend(this.id, OS.sel_getModifierState_1, keyIdentifierArg !is null ? keyIdentifierArg.id : 0) !is 0;
-    }
+public int charCode() {
+    return cast(int)/*64*/OS.objc_msgSend(this.id, OS.sel_charCode);
+}
 
-    public int keyCode () {
-        return OS.objc_msgSend(this.id, OS.sel_keyCode);
-    }
+public bool ctrlKey() {
+    return OS.objc_msgSend_bool(this.id, OS.sel_ctrlKey);
+}
 
-    public int keyLocation () {
-        return OS.objc_msgSend(this.id, OS.sel_keyLocation);
-    }
-
-    public bool metaKey () {
-        return OS.objc_msgSend(this.id, OS.sel_metaKey) !is 0;
-    }
+public int keyCode() {
+    return cast(int)/*64*/OS.objc_msgSend(this.id, OS.sel_keyCode);
+}
 
-    public void preventDefault () {
-        OS.objc_msgSend(this.id, OS.sel_preventDefault);
-    }
+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);
+}
 
 }