--- a/dwt/internal/mozilla/nsIDOMEvent.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIDOMEvent.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,91 +1,39 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and DWT
- * -  Copyright (C) 2003, 2008 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
 module dwt.internal.mozilla.nsIDOMEvent;
 
-import dwt.dwthelper.utils;
-
-public class nsIDOMEvent extends nsISupports {
-
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsIDOMEventTarget;
+import dwt.internal.mozilla.nsStringAPI;
 
-    public static final String NS_IDOMEVENT_IID_STR =
-        "a66b7b80-ff46-bd97-0080-5f8ae38add32";
-
-    public static final nsID NS_IDOMEVENT_IID =
-        new nsID(NS_IDOMEVENT_IID_STR);
+alias PRUint64 DOMTimeStamp;
 
-    public nsIDOMEvent(int /*long*/ address) {
-        super(address);
-    }
-
-    public static final int CAPTURING_PHASE = 1;
-
-    public static final int AT_TARGET = 2;
+const char[] NS_IDOMEVENT_IID_STR = "a66b7b80-ff46-bd97-0080-5f8ae38add32";
 
-    public static final int BUBBLING_PHASE = 3;
+const nsIID NS_IDOMEVENT_IID= 
+  {0xa66b7b80, 0xff46, 0xbd97, 
+    [ 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0x8a, 0xdd, 0x32 ]};
 
-    public int GetType(int /*long*/ aType) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
-    }
+interface nsIDOMEvent : nsISupports {
 
-    public int GetTarget(int /*long*/[] aTarget) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
-    }
+  static const char[] IID_STR = NS_IDOMEVENT_IID_STR;
+  static const nsIID IID = NS_IDOMEVENT_IID;
 
-    public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
-    }
-
-    public int GetEventPhase(short[] aEventPhase) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEventPhase);
-    }
-
-    public int GetBubbles(int[] aBubbles) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aBubbles);
-    }
-
-    public int GetCancelable(int[] aCancelable) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
-    }
+extern(System):
+  enum { CAPTURING_PHASE = 1U };
+  enum { AT_TARGET = 2U };
+  enum { BUBBLING_PHASE = 3U };
 
-    public int GetTimeStamp(int /*long*/[] aTimeStamp) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
-    }
-
-    public int StopPropagation() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
-    }
+  nsresult GetType(nsAString * aType);
+  nsresult GetTarget(nsIDOMEventTarget  *aTarget);
+  nsresult GetCurrentTarget(nsIDOMEventTarget  *aCurrentTarget);
+  nsresult GetEventPhase(PRUint16 *aEventPhase);
+  nsresult GetBubbles(PRBool *aBubbles);
+  nsresult GetCancelable(PRBool *aCancelable);
+  nsresult GetTimeStamp(DOMTimeStamp *aTimeStamp);
+  nsresult StopPropagation();
+  nsresult PreventDefault();
+  nsresult InitEvent(nsAString * eventTypeArg, PRBool canBubbleArg, PRBool cancelableArg);
 
-    public int PreventDefault() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
-    }
+}
 
-    public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
-    }
-}