--- a/dwt/internal/mozilla/nsIDOMUIEvent.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIDOMUIEvent.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,57 +1,27 @@
-/* ***** 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.nsIDOMUIEvent;
 
-import dwt.dwthelper.utils;
-
-public class nsIDOMUIEvent extends nsIDOMEvent {
-
-    static final int LAST_METHOD_ID = nsIDOMEvent.LAST_METHOD_ID + 3;
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
 
-    public static final String NS_IDOMUIEVENT_IID_STR =
-        "a6cf90c3-15b3-11d2-932e-00805f8add32";
+import dwt.internal.mozilla.nsIDOMEvent;
+import dwt.internal.mozilla.nsStringAPI;
+import dwt.internal.mozilla.nsIDOMAbstractView;
 
-    public static final nsID NS_IDOMUIEVENT_IID =
-        new nsID(NS_IDOMUIEVENT_IID_STR);
+const char[] NS_IDOMUIEVENT_IID_STR = "a6cf90c3-15b3-11d2-932e-00805f8add32";
+
+const nsIID NS_IDOMUIEVENT_IID= 
+  {0xa6cf90c3, 0x15b3, 0x11d2, 
+    [ 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 ]};
 
-    public nsIDOMUIEvent(int /*long*/ address) {
-        super(address);
-    }
+interface nsIDOMUIEvent : nsIDOMEvent {
 
-    public int GetView(int /*long*/[] aView) {
-        return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
-    }
+  static const char[] IID_STR = NS_IDOMUIEVENT_IID_STR;
+  static const nsIID IID = NS_IDOMUIEVENT_IID;
 
-    public int GetDetail(int[] aDetail) {
-        return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
-    }
+extern(System):
+  nsresult GetView(nsIDOMAbstractView  *aView);
+  nsresult GetDetail(PRInt32 *aDetail);
+  nsresult InitUIEvent(nsAString * typeArg, PRBool canBubbleArg, PRBool cancelableArg, nsIDOMAbstractView viewArg, PRInt32 detailArg);
 
-    public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
-        return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
-    }
 }
+