--- a/dwt/internal/mozilla/nsIEmbeddingSiteWindow.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/internal/mozilla/nsIEmbeddingSiteWindow.d	Fri Jan 16 12:49:08 2009 +0100
@@ -1,83 +1,33 @@
-/* ***** 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.nsIEmbeddingSiteWindow;
 
-import dwt.dwthelper.utils;
-
-public class nsIEmbeddingSiteWindow extends nsISupports {
-
-    static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+import dwt.internal.mozilla.Common;
+import dwt.internal.mozilla.nsID;
+import dwt.internal.mozilla.nsISupports;
 
-    public static final String NS_IEMBEDDINGSITEWINDOW_IID_STR =
-        "3e5432cd-9568-4bd1-8cbe-d50aba110743";
-
-    public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
-        new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
+const char[] NS_IEMBEDDINGSITEWINDOW_IID_STR = "3e5432cd-9568-4bd1-8cbe-d50aba110743";
 
-    public nsIEmbeddingSiteWindow(int /*long*/ address) {
-        super(address);
-    }
-
-    public static final int DIM_FLAGS_POSITION = 1;
+const nsIID NS_IEMBEDDINGSITEWINDOW_IID= 
+  {0x3e5432cd, 0x9568, 0x4bd1, 
+    [ 0x8c, 0xbe, 0xd5, 0x0a, 0xba, 0x11, 0x07, 0x43 ]};
 
-    public static final int DIM_FLAGS_SIZE_INNER = 2;
-
-    public static final int DIM_FLAGS_SIZE_OUTER = 4;
+interface nsIEmbeddingSiteWindow : nsISupports {
 
-    public int SetDimensions(int flags, int x, int y, int cx, int cy) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), flags, x, y, cx, cy);
-    }
+  static const char[] IID_STR = NS_IEMBEDDINGSITEWINDOW_IID_STR;
+  static const nsIID IID = NS_IEMBEDDINGSITEWINDOW_IID;
 
-    public int GetDimensions(int flags, int[] x, int[] y, int[] cx, int[] cy) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), flags, x, y, cx, cy);
-    }
-
-    public int SetFocus() {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
-    }
-
-    public int GetVisibility(int[] aVisibility) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aVisibility);
-    }
+  enum { DIM_FLAGS_POSITION = 1U };
+  enum { DIM_FLAGS_SIZE_INNER = 2U };
+  enum { DIM_FLAGS_SIZE_OUTER = 4U };
 
-    public int SetVisibility(int aVisibility) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
-    }
-
-    public int GetTitle(int /*long*/[] aTitle) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
-    }
+extern(System):
+  nsresult SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy);
+  nsresult GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy);
+  nsresult SetFocus();
+  nsresult GetVisibility(PRBool *aVisibility);
+  nsresult SetVisibility(PRBool aVisibility);
+  nsresult GetTitle(PRUnichar * *aTitle);
+  nsresult SetTitle(PRUnichar * aTitle);
+  nsresult GetSiteWindow(void * *aSiteWindow);
 
-    public int SetTitle(char[] aTitle) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
-    }
+}
 
-    public int GetSiteWindow(int /*long*/[] aSiteWindow) {
-        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
-    }
-}