--- a/dwt/internal/mozilla/nsICancelable.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsICancelable.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,49 +1,21 @@
-/* ***** 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 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
 module dwt.internal.mozilla.nsICancelable;
 
-import dwt.dwthelper.utils;
-
-public class nsICancelable extends nsISupports {
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
 
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
+const char[] NS_ICANCELABLE_IID_STR = "d94ac0a0-bb18-46b8-844e-84159064b0bd";
 
-    public static final String NS_ICANCELABLE_IID_STR =
-        "d94ac0a0-bb18-46b8-844e-84159064b0bd";
+const nsIID NS_ICANCELABLE_IID= 
+  {0xd94ac0a0, 0xbb18, 0x46b8, 
+    [ 0x84, 0x4e, 0x84, 0x15, 0x90, 0x64, 0xb0, 0xbd ]};
 
-    public static final nsID NS_ICANCELABLE_IID =
-        new nsID(NS_ICANCELABLE_IID_STR);
+interface nsICancelable : nsISupports {
+
+  static const char[] IID_STR = NS_ICANCELABLE_IID_STR;
+  static const nsIID IID = NS_ICANCELABLE_IID;
 
-    public nsICancelable(int /*long*/ address) {
-        super(address);
-    }
+extern(System):
+  nsresult Cancel(nsresult aReason);
+}
 
-    public int Cancel(int aReason) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aReason);
-    }
-}