--- a/dwt/internal/mozilla/nsIProgressDialog_1_8.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIProgressDialog_1_8.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,73 +1,32 @@
-/* ***** 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.nsIProgressDialog_1_8;
 
-import dwt.dwthelper.utils;
-
-public class nsIProgressDialog_1_8 extends nsIDownload_1_8 {
-
-    static final int LAST_METHOD_ID = nsIDownload_1_8.LAST_METHOD_ID + 7;
-
-    public static final String NS_IPROGRESSDIALOG_IID_STR =
-        "20e790a2-76c6-462d-851a-22ab6cbbe48b";
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
+import dwt.internal.mozilla.nsIDownload;
+import dwt.internal.mozilla.nsIDOMWindow; 
+import dwt.internal.mozilla.nsIObserver;
+import dwt.internal.mozilla.nsIDownload_1_8;
 
-    public static final nsID NS_IPROGRESSDIALOG_IID =
-        new nsID(NS_IPROGRESSDIALOG_IID_STR);
+const char[] NS_IPROGRESSDIALOG_IID_STR = "20e790a2-76c6-462d-851a-22ab6cbbe48b";
 
-    public nsIProgressDialog_1_8(int /*long*/ address) {
-        super(address);
-    }
-
-    public int Open(int /*long*/ aParent) {
-        return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
-    }
+const nsIID NS_IPROGRESSDIALOG_IID= 
+  {0x20e790a2, 0x76c6, 0x462d, 
+    [ 0x85, 0x1a, 0x22, 0xab, 0x6c, 0xbb, 0xe4, 0x8b ]};
 
-    public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
-        return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
-    }
+interface nsIProgressDialog_1_8 : nsIDownload_1_8 {
 
-    public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
-        return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
-    }
-
-    public int GetObserver(int /*long*/[] aObserver) {
-        return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
-    }
+  static const char[] IID_STR = NS_IPROGRESSDIALOG_IID_STR;
+  static const nsIID IID = NS_IPROGRESSDIALOG_IID;
 
-    public int SetObserver(int /*long*/ aObserver) {
-        return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
-    }
+extern(System):
+  nsresult Open(nsIDOMWindow aParent);
+  nsresult GetCancelDownloadOnClose(PRBool *aCancelDownloadOnClose);
+  nsresult SetCancelDownloadOnClose(PRBool aCancelDownloadOnClose);
+  nsresult GetObserver(nsIObserver  *aObserver);
+  nsresult SetObserver(nsIObserver  aObserver);
+  nsresult GetDialog(nsIDOMWindow  *aDialog);
+  nsresult SetDialog(nsIDOMWindow  aDialog);
 
-    public int GetDialog(int /*long*/[] aDialog) {
-        return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
-    }
+}
 
-    public int SetDialog(int /*long*/ aDialog) {
-        return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
-    }
-}