--- a/dwt/internal/mozilla/nsIAppShell.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIAppShell.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,77 +1,28 @@
-/* ***** 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.nsIAppShell;
 
-import dwt.dwthelper.utils;
-
-public class nsIAppShell extends nsISupports {
-
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
-
-    public static final String NS_IAPPSHELL_IID_STR =
-        "a0757c31-eeac-11d1-9ec1-00aa002fb821";
-
-    public static final nsID NS_IAPPSHELL_IID =
-        new nsID(NS_IAPPSHELL_IID_STR);
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsIEventQueue;
 
-    public nsIAppShell(int /*long*/ address) {
-        super(address);
-    }
+const char[] NS_IAPPSHELL_IID_STR = "a0757c31-eeac-11d1-9ec1-00aa002fb821";
 
-    public int Create(int /*long*/ argc, int /*long*/[] argv) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
-    }
-
-    public int Run() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
-    }
+const nsIID NS_IAPPSHELL_IID= 
+  {0xa0757c31, 0xeeac, 0x11d1, 
+    [ 0x9e, 0xc1, 0x00, 0xaa, 0x00, 0x2f, 0xb8, 0x21 ]};
 
-    public int Spinup() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
-    }
-
-    public int Spindown() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
-    }
-
-    public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
-    }
+interface nsIAppShell : nsISupports {
+  static const char[] IID_STR = NS_IAPPSHELL_IID_STR;
+  static const nsIID IID = NS_IAPPSHELL_IID;
 
-    public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
-    }
+extern(System):
+  nsresult Create(int *argc, char **argv);
+  nsresult Run();
+  nsresult Spinup();
+  nsresult Spindown();
+  nsresult ListenToEventQueue(nsIEventQueue * aQueue, PRBool aListen);
+  nsresult GetNativeEvent(PRBool * aRealEvent, void * * aEvent);
+  nsresult DispatchNativeEvent(PRBool aRealEvent, void * aEvent);
+  nsresult Exit();
+}
 
-    public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
-    }
-
-    public int Exit() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
-    }
-}