--- a/dwt/internal/mozilla/nsIWebProgress.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIWebProgress.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,81 +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.nsIWebProgress;
 
-import dwt.dwthelper.utils;
-
-public class nsIWebProgress extends nsISupports {
-
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
 
-    public static final String NS_IWEBPROGRESS_IID_STR =
-        "570f39d0-efd0-11d3-b093-00a024ffc08c";
+import dwt.internal.mozilla.nsIDOMWindow; 
+import dwt.internal.mozilla.nsIWebProgressListener; 
 
-    public static final nsID NS_IWEBPROGRESS_IID =
-        new nsID(NS_IWEBPROGRESS_IID_STR);
+const char[] NS_IWEBPROGRESS_IID_STR = "570f39d0-efd0-11d3-b093-00a024ffc08c";
 
-    public nsIWebProgress(int /*long*/ address) {
-        super(address);
-    }
-
-    public static final int NOTIFY_STATE_REQUEST = 1;
+const nsIID NS_IWEBPROGRESS_IID= 
+  {0x570f39d0, 0xefd0, 0x11d3, 
+    [ 0xb0, 0x93, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c ]};
 
-    public static final int NOTIFY_STATE_DOCUMENT = 2;
-
-    public static final int NOTIFY_STATE_NETWORK = 4;
+interface nsIWebProgress : nsISupports {
 
-    public static final int NOTIFY_STATE_WINDOW = 8;
-
-    public static final int NOTIFY_STATE_ALL = 15;
+  static const char[] IID_STR = NS_IWEBPROGRESS_IID_STR;
+  static const nsIID IID = NS_IWEBPROGRESS_IID;
 
-    public static final int NOTIFY_PROGRESS = 16;
-
-    public static final int NOTIFY_STATUS = 32;
-
-    public static final int NOTIFY_SECURITY = 64;
-
-    public static final int NOTIFY_LOCATION = 128;
-
-    public static final int NOTIFY_ALL = 255;
+extern(System):
+  enum { NOTIFY_STATE_REQUEST = 1U };
+  enum { NOTIFY_STATE_DOCUMENT = 2U };
+  enum { NOTIFY_STATE_NETWORK = 4U };
+  enum { NOTIFY_STATE_WINDOW = 8U };
+  enum { NOTIFY_STATE_ALL = 15U };
+  enum { NOTIFY_PROGRESS = 16U };
+  enum { NOTIFY_STATUS = 32U };
+  enum { NOTIFY_SECURITY = 64U };
+  enum { NOTIFY_LOCATION = 128U };
+  enum { NOTIFY_ALL = 255U };
 
-    public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
-    }
-
-    public int RemoveProgressListener(int /*long*/ listener) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
-    }
+  nsresult AddProgressListener(nsIWebProgressListener aListener, PRUint32 aNotifyMask);
+  nsresult RemoveProgressListener(nsIWebProgressListener aListener);
+  nsresult GetDOMWindow(nsIDOMWindow  *aDOMWindow);
+  nsresult GetIsLoadingDocument(PRBool *aIsLoadingDocument);
 
-    public int GetDOMWindow(int /*long*/[] aDOMWindow) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
-    }
+}
 
-    public int GetIsLoadingDocument(int[] aIsLoadingDocument) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument);
-    }
-}