--- a/dwt/browser.old/AppFileLocProvider.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
-  * Port to the D programming language:
- *     John Reimer <terminal.node@gmail.com>
- *******************************************************************************/
-
-module dwt.browser.AppFileLocProvider;
-
-import dwt.dwthelper.utils;
-
-import dwt.internal.Compatibility;
-
-import dwt.internal.mozilla.nsEmbedString;
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIDirectoryService;
-import dwt.internal.mozilla.nsIFile;
-import dwt.internal.mozilla.nsILocalFile;
-import dwt.internal.mozilla.nsISupports;
-
-class AppFileLocProvider : nsISupports, nsIDirectoryServiceProvider2 
-{
-    // XPCOMObject supports;
-    // XPCOMObject directoryServiceProvider;
-    // XPCOMObject directoryServiceProvider2;  
-    nsrefcnt _refCount = 0;
-    String   mozillaPath, profilePath;
-    String[] pluginDirs;
-    bool     isXULRunner;
-    
-    static String SEPARATOR_OS = System.getProperty ("file.separator"); //$NON-NLS-1$
-    static String CHROME_DIR = "chrome"; //$NON-NLS-1$
-    static String COMPONENTS_DIR = "components"; //$NON-NLS-1$
-    static String HISTORY_FILE = "history.dat"; //$NON-NLS-1$
-    static String LOCALSTORE_FILE = "localstore.rdf"; //$NON-NLS-1$
-    static String MIMETYPES_FILE = "mimeTypes.rdf"; //$NON-NLS-1$
-    static String PLUGINS_DIR = "plugins"; //$NON-NLS-1$
-    static String USER_PLUGINS_DIR = ".mozilla" + SEPARATOR_OS + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
-    static String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
-    
-AppFileLocProvider (String path) {
-    mozillaPath = path + SEPARATOR_OS;
-    createCOMInterfaces ();
-}
-
-    int AddRef () 
-    {
-        refCount++;
-        return refCount;
-    }
-
-    nsresult QueryInterface ( nsIID* riid, void** ppvObject) 
-    {
-        if (riid is null || ppvObject is null) 
-            return NS_ERROR_NO_INTERFACE;
-
-        if (riid == nsISupports.IID) 
-        {
-            *ppvObject =cast(void*)cast(nsISupports)this;
-            AddRef ();
-            return NS_OK;
-        }
-
-        if (riid == nsIDirectoryServiceProvider.IID) 
-        {
-            *ppvObject = cast(void*)cast(nsIDirectoryServiceProvider)this;
-            AddRef ();
-            return NS_OK;
-        }
-
-        if (riid == nsDirectoryServiceProvider2.IID) {
-            *ppvObject = cast(void*)cast(nsIDirectoryServiceProvider2)this;
-            AddRef ();
-            return NS_OK;
-        }
-    
-        *ppvObject = null;
-        return NS_ERROR_NO_INTERFACE;
-    } 
-
-    nsrefcnt Release () 
-    {
-        _refCount--;
-        if (_refCount is 0) 
-            return 0;
-        return _refCount;
-    }
-
-void setProfilePath (String path) {
-    profilePath = path;
-    if (!Compatibility.fileExists (path, "")) { //$NON-NLS-1$
-        int /*long*/[] result = new int /*long*/[1];
-        nsEmbedString pathString = new nsEmbedString (path);
-        int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-        if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-        if (result[0] is 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-        pathString.dispose ();
-
-        nsILocalFile file = new nsILocalFile (result [0]);
-        rc = file.Create (nsILocalFile.DIRECTORY_TYPE, 0700);
-        if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-        file.Release ();
-    }
-}
-
-/* nsIDirectoryServiceProvider2 */
-
-int getFiles (int /*long*/ prop, int /*long*/ _retval) {
-    int size = XPCOM.strlen (prop);
-    byte[] bytes = new byte[size];
-    XPCOM.memmove (bytes, prop, size);
-    String propertyName = new String (MozillaDelegate.mbcsToWcs (null, bytes));
-    String[] propertyValues = null;
-
-    if (propertyName.equals (XPCOM.NS_APP_PLUGINS_DIR_LIST)) {
-        if (pluginDirs is null) {
-            int index = 0;
-            /* set the first value(s) to the MOZ_PLUGIN_PATH environment variable value if it's defined */
-            int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_PLUGIN_PATH, true));
-            if (ptr !is 0) {
-                int length = C.strlen (ptr);
-                byte[] buffer = new byte[length];
-                C.memmove (buffer, ptr, length);
-                String value = new String (MozillaDelegate.mbcsToWcs (null, buffer));
-                if (value.length () > 0) {
-                    String separator = System.getProperty ("path.separator"); // $NON-NLS-1$
-                    Vector segments = new Vector ();
-                    int start, end = -1;
-                    do {
-                        start = end + 1;
-                        end = value.indexOf (separator, start);
-                        String segment;
-                        if (end is -1) {
-                            segment = value.substring (start);
-                        } else {
-                            segment = value.substring (start, end);
-                        }
-                        if (segment.length () > 0) segments.addElement (segment);
-                    } while (end !is -1);
-                    int segmentsSize = segments.size ();
-                    pluginDirs = new String [segmentsSize + 2];
-                    for (index = 0; index < segmentsSize; index++) {
-                        pluginDirs[index] = (String)segments.elementAt (index);
-                    }
-                }
-            }
-            if (pluginDirs is null) {
-                pluginDirs = new String[2];
-            }
-
-            /* set the next value to the GRE path + "plugins" */
-            pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
-
-            /* set the next value to the home directory + "/.mozilla/plugins" */
-            pluginDirs[index++] = System.getProperty("user.home") + SEPARATOR_OS + USER_PLUGINS_DIR;
-        }
-        propertyValues = pluginDirs;
-    }
-
-    XPCOM.memmove(_retval, new int /*long*/[] {0}, C.PTR_SIZEOF);
-    if (propertyValues !is null) {
-        int /*long*/[] result = new int /*long*/[1];
-        nsISupports[] files = new nsISupports [propertyValues.length];
-        int index = 0;
-        for (int i = 0; i < propertyValues.length; i++) {
-            nsEmbedString pathString = new nsEmbedString (propertyValues[i]);
-            int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-            if (rc !is XPCOM.NS_ERROR_FILE_UNRECOGNIZED_PATH) {
-                /* value appears to be a valid pathname */
-                if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-                if (result[0] is 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-
-                nsILocalFile localFile = new nsILocalFile (result[0]);
-                result[0] = 0;
-                rc = localFile.QueryInterface (nsIFile.NS_IFILE_IID, result); 
-                if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-                if (result[0] is 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-                localFile.Release ();
-
-                nsIFile file = new nsIFile (result[0]);
-                files[index++] = file;
-            }
-            pathString.dispose ();
-            result[0] = 0;
-        }
-
-        if (index < propertyValues.length) {
-            /* there were some invalid values so remove the trailing empty array slots */
-            nsISupports[] temp = new nsISupports [index];
-            System.arraycopy (files, 0, temp, 0, index);
-            files = temp;
-        }
-
-        SimpleEnumerator enumerator = new SimpleEnumerator (files);
-        enumerator.AddRef ();
-        XPCOM.memmove (_retval, new int /*long*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF);
-        return XPCOM.NS_OK;
-    }
-
-    return XPCOM.NS_ERROR_FAILURE;
-}   
-    
-/* nsIDirectoryServiceProvider implementation */
-
-int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
-    int size = XPCOM.strlen (prop);
-    byte[] bytes = new byte[size];
-    XPCOM.memmove (bytes, prop, size);
-    String propertyName = new String (MozillaDelegate.mbcsToWcs (null, bytes));
-    String propertyValue = null;
-
-    if (propertyName.equals (XPCOM.NS_APP_HISTORY_50_FILE)) {
-        propertyValue = profilePath + HISTORY_FILE;
-    } else if (propertyName.equals (XPCOM.NS_APP_USER_MIMETYPES_50_FILE)) {
-        propertyValue = profilePath + MIMETYPES_FILE;
-    } else if (propertyName.equals (XPCOM.NS_APP_PREFS_50_FILE)) {
-        propertyValue = profilePath + PREFERENCES_FILE;
-    } else if (propertyName.equals (XPCOM.NS_APP_PREFS_50_DIR)) {
-        propertyValue = profilePath;
-    } else if (propertyName.equals (XPCOM.NS_APP_USER_CHROME_DIR)) {
-        propertyValue = profilePath + CHROME_DIR;
-    } else if (propertyName.equals (XPCOM.NS_APP_USER_PROFILE_50_DIR)) {
-        propertyValue = profilePath;
-    } else if (propertyName.equals (XPCOM.NS_APP_LOCALSTORE_50_FILE)) {
-        propertyValue = profilePath + LOCALSTORE_FILE;
-    } else if (propertyName.equals (XPCOM.NS_APP_CACHE_PARENT_DIR)) {
-        propertyValue = profilePath;
-    } else if (propertyName.equals (XPCOM.NS_OS_HOME_DIR)) {
-        propertyValue = System.getProperty("user.home");    //$NON-NLS-1$
-    } else if (propertyName.equals (XPCOM.NS_OS_TEMP_DIR)) {
-        propertyValue = System.getProperty("java.io.tmpdir");   //$NON-NLS-1$
-    } else if (propertyName.equals (XPCOM.NS_GRE_DIR)) {
-        propertyValue = mozillaPath;
-    } else if (propertyName.equals (XPCOM.NS_GRE_COMPONENT_DIR)) {
-        propertyValue = mozillaPath + COMPONENTS_DIR;
-    } else if (propertyName.equals (XPCOM.NS_XPCOM_INIT_CURRENT_PROCESS_DIR)) {
-        propertyValue = mozillaPath;
-    } else if (propertyName.equals (XPCOM.NS_OS_CURRENT_PROCESS_DIR)) {
-        propertyValue = mozillaPath;
-    } else if (propertyName.equals (XPCOM.NS_XPCOM_COMPONENT_DIR)) {
-        propertyValue = mozillaPath + COMPONENTS_DIR;
-    } else if (propertyName.equals (XPCOM.NS_XPCOM_CURRENT_PROCESS_DIR)) {
-        propertyValue = mozillaPath;
-    } else if (propertyName.equals (XPCOM.NS_APP_PREF_DEFAULTS_50_DIR)) {
-        /*
-        * Answering a value for this property causes problems in Mozilla versions
-        * < 1.7.  Unfortunately this property is queried early enough in the
-        * Browser creation process that the Mozilla version being used is not
-        * yet determined.  However it is known if XULRunner is being used or not.
-        * 
-        * For now answer a value for this property iff XULRunner is the GRE.
-        * If the range of Mozilla versions supported by the Browser is changed
-        * in the future to be >= 1.7 then this value can always be answered.  
-        */
-        if (isXULRunner) propertyValue = profilePath;
-    }
-
-    XPCOM.memmove (persistent, new int[] {1}, 4); /* PRBool */
-    XPCOM.memmove (_retval, new int /*long*/[] {0}, C.PTR_SIZEOF);
-    if (propertyValue !is null && propertyValue.length () > 0) {
-        int /*long*/[] result = new int /*long*/[1];
-        nsEmbedString pathString = new nsEmbedString (propertyValue);
-        int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
-        if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-        if (result[0] is 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-        pathString.dispose ();
-        
-        nsILocalFile localFile = new nsILocalFile (result [0]);
-        result[0] = 0;
-        rc = localFile.QueryInterface (nsIFile.NS_IFILE_IID, result); 
-        if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-        if (result[0] is 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-
-        XPCOM.memmove (_retval, new int /*long*/[] {result[0]}, C.PTR_SIZEOF);
-        localFile.Release ();
-        return XPCOM.NS_OK;
-    }
-
-    return XPCOM.NS_ERROR_FAILURE;
-}       
-}

--- a/dwt/browser.old/Browser.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,782 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.browser.Browser;
-
-import dwt.dwthelper.utils;
-
-import dwt.DWT;
-import dwt.DWTError;
-import dwt.DWTException;
-import dwt.widgets.Composite;
-import dwt.widgets.Display;
-import dwt.widgets.Widget;
-
-/**
- * Instances of this class implement the browser user interface
- * metaphor.  It allows the user to visualize and navigate through
- * HTML documents.
- * <p>
- * Note that although this class is a subclass of <code>Composite</code>,
- * it does not make sense to set a layout on it.
- * </p>
- * <dl>
- * <dt><b>Styles:</b></dt>
- * <dd>MOZILLA</dd>
- * <dt><b>Events:</b></dt>
- * <dd>CloseWindowListener, LocationListener, OpenWindowListener, ProgressListener, StatusTextListener, TitleListener, VisibilityWindowListener</dd>
- * </dl>
- * <p>
- * IMPORTANT: This class is <em>not</em> intended to be subclassed.
- * </p>
- * 
- * @since 3.0
- */
-
-public class Browser extends Composite {
-    WebBrowser webBrowser;
-    int userStyle;
-
-    static final String PACKAGE_PREFIX = "dwt.browser."; //$NON-NLS-1$
-    static final String NO_INPUT_METHOD = "dwt.internal.gtk.noInputMethod"; //$NON-NLS-1$
-
-/**
- * Constructs a new instance of this class given its parent
- * and a style value describing its behavior and appearance.
- * <p>
- * The style value is either one of the style constants defined in
- * class <code>DWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
- * (that is, using the <code>int</code> "|" operator) two or more
- * of those <code>DWT</code> style constants. The class description
- * lists the style constants that are applicable to the class.
- * Style bits are also inherited from superclasses.
- * </p>
- *
- * @param parent a widget which will be the parent of the new instance (cannot be null)
- * @param style the style of widget to construct
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
- * </ul>
- * @exception DWTError <ul>
- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for browser creation</li>
- * </ul>
- * 
- * @see Widget#getStyle
- * 
- * @since 3.0
- */
-public Browser (Composite parent, int style) {
-    super (checkParent (parent), checkStyle (style));
-    userStyle = style;
-
-    String platform = DWT.getPlatform ();
-    Display display = parent.getDisplay ();
-    if ("gtk".equals (platform)) display.setData (NO_INPUT_METHOD, null); //$NON-NLS-1$
-    String className = null;
-    if ((style & DWT.MOZILLA) !is 0) {
-        className = "dwt.browser.Mozilla"; //$NON-NLS-1$
-    } else {
-        if ("win32".equals (platform) || "wpf".equals (platform)) { //$NON-NLS-1$ $NON-NLS-2$
-            className = "dwt.browser.IE"; //$NON-NLS-1$
-        } else if ("motif".equals (platform)) { //$NON-NLS-1$
-            className = "dwt.browser.Mozilla"; //$NON-NLS-1$
-        } else if ("gtk".equals (platform)) { //$NON-NLS-1$
-            className = "dwt.browser.Mozilla"; //$NON-NLS-1$
-        } else if ("carbon".equals (platform) || "cocoa".equals (platform)) { //$NON-NLS-1$
-            className = "dwt.browser.Safari"; //$NON-NLS-1$
-        } else if ("photon".equals (platform)) { //$NON-NLS-1$
-            className = "dwt.browser.Voyager"; //$NON-NLS-1$
-        } else {
-            dispose ();
-            DWT.error (DWT.ERROR_NO_HANDLES);
-        }
-    }
-
-    try {
-        Class clazz = Class.forName (className);
-        webBrowser = (WebBrowser)clazz.newInstance ();
-    } catch (ClassNotFoundException e) {
-    } catch (IllegalAccessException e) {
-    } catch (InstantiationException e) {
-    }
-    if (webBrowser is null) {
-        dispose ();
-        DWT.error (DWT.ERROR_NO_HANDLES);
-    }
-
-    webBrowser.setBrowser (this);
-    webBrowser.create (parent, style);
-}
-
-static Composite checkParent (Composite parent) {
-    String platform = DWT.getPlatform ();
-    if (!"gtk".equals (platform)) return parent; //$NON-NLS-1$
-
-    /*
-    * Note.  Mozilla provides all IM support needed for text input in web pages.
-    * If DWT creates another input method context for the widget it will cause
-    * indeterminate results to happen (hangs and crashes). The fix is to prevent 
-    * DWT from creating an input method context for the  Browser widget.
-    */
-    if (parent !is null && !parent.isDisposed ()) {
-        Display display = parent.getDisplay ();
-        if (display !is null) {
-            if (display.getThread () is Thread.currentThread ()) {
-                display.setData (NO_INPUT_METHOD, "true"); //$NON-NLS-1$
-            }
-        }
-    }
-    return parent;
-}
-
-static int checkStyle(int style) {
-    String platform = DWT.getPlatform ();
-    if ((style & DWT.MOZILLA) !is 0) {
-        if ("carbon".equals (platform)) return style | DWT.EMBEDDED; //$NON-NLS-1$
-        if ("motif".equals (platform)) return style | DWT.EMBEDDED; //$NON-NLS-1$
-        return style;
-    }
-
-    if ("win32".equals (platform)) { //$NON-NLS-1$
-        /*
-        * For IE on win32 the border is supplied by the embedded browser, so remove
-        * the style so that the parent Composite will not draw a second border.
-        */
-        return style & ~DWT.BORDER;
-    } else if ("motif".equals (platform)) { //$NON-NLS-1$
-        return style | DWT.EMBEDDED;
-    }
-    return style;
-}
-
-/**
- * Clears all session cookies from all current Browser instances.
- * 
- * @since 3.2
- */
-public static void clearSessions () {
-    WebBrowser.clearSessions ();
-}
-
-/**  
- * Adds the listener to the collection of listeners who will be
- * notified when the window hosting the receiver should be closed.
- * <p>
- * This notification occurs when a javascript command such as
- * <code>window.close</code> gets executed by a <code>Browser</code>.
- * </p>
- *
- * @param listener the listener which should be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.0
- */
-public void addCloseWindowListener (CloseWindowListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.addCloseWindowListener (listener);
-}
-
-/**  
- * Adds the listener to the collection of listeners who will be
- * notified when the current location has changed or is about to change.
- * <p>
- * This notification typically occurs when the application navigates
- * to a new location with {@link #setUrl(String)} or when the user
- * activates a hyperlink.
- * </p>
- *
- * @param listener the listener which should be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.0
- */
-public void addLocationListener (LocationListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.addLocationListener (listener);
-}
-
-/**  
- * Adds the listener to the collection of listeners who will be
- * notified when a new window needs to be created.
- * <p>
- * This notification occurs when a javascript command such as
- * <code>window.open</code> gets executed by a <code>Browser</code>.
- * </p>
- *
- * @param listener the listener which should be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.0
- */
-public void addOpenWindowListener (OpenWindowListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.addOpenWindowListener (listener);
-}
-
-/**  
- * Adds the listener to the collection of listeners who will be
- * notified when a progress is made during the loading of the current 
- * URL or when the loading of the current URL has been completed.
- *
- * @param listener the listener which should be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.0
- */
-public void addProgressListener (ProgressListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.addProgressListener (listener);
-}
-
-/**  
- * Adds the listener to the collection of listeners who will be
- * notified when the status text is changed.
- * <p>
- * The status text is typically displayed in the status bar of
- * a browser application.
- * </p>
- *
- * @param listener the listener which should be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.0
- */
-public void addStatusTextListener (StatusTextListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.addStatusTextListener (listener);
-}
-
-/**  
- * Adds the listener to the collection of listeners who will be
- * notified when the title of the current document is available
- * or has changed.
- *
- * @param listener the listener which should be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.0
- */
-public void addTitleListener (TitleListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.addTitleListener (listener);
-}
-
-/**  
- * Adds the listener to the collection of listeners who will be
- * notified when a window hosting the receiver needs to be displayed
- * or hidden.
- *
- * @param listener the listener which should be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.0
- */
-public void addVisibilityWindowListener (VisibilityWindowListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.addVisibilityWindowListener (listener);
-}
-
-/**
- * Navigate to the previous session history item.
- *
- * @return <code>true</code> if the operation was successful and <code>false</code> otherwise
- *
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @see #forward
- * 
- * @since 3.0
- */
-public bool back () {
-    checkWidget();
-    return webBrowser.back ();
-}
-
-protected void checkSubclass () {
-    String name = getClass ().getName ();
-    int index = name.lastIndexOf ('.');
-    if (!name.substring (0, index + 1).equals (PACKAGE_PREFIX)) {
-        DWT.error (DWT.ERROR_INVALID_SUBCLASS);
-    }
-}
-
-/**
- * Execute the specified script.
- *
- * <p>
- * Execute a script containing javascript commands in the context of the current document. 
- * 
- * @param script the script with javascript commands
- *  
- * @return <code>true</code> if the operation was successful and <code>false</code> otherwise
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the script is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.1
- */
-public bool execute (String script) {
-    checkWidget();
-    if (script is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    return webBrowser.execute (script);
-}
-
-/**
- * Navigate to the next session history item.
- *
- * @return <code>true</code> if the operation was successful and <code>false</code> otherwise
- *
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- * 
- * @see #back
- * 
- * @since 3.0
- */
-public bool forward () {
-    checkWidget();
-    return webBrowser.forward ();
-}
-
-public int getStyle () {
-    /*
-    * If DWT.BORDER was specified at creation time then getStyle() should answer
-    * it even though it is removed for IE on win32 in checkStyle().
-    */
-    return super.getStyle () | (userStyle & DWT.BORDER);
-}
-
-/**
- * Returns a string with HTML that represents the content of the current page.
- *
- * @return HTML representing the current page or an empty <code>String</code>
- * if this is empty
- *
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.4
- */
-public String getText () {
-    checkWidget();
-    return webBrowser.getText ();
-}
-
-/**
- * Returns the current URL.
- *
- * @return the current URL or an empty <code>String</code> if there is no current URL
- *
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @see #setUrl
- * 
- * @since 3.0
- */
-public String getUrl () {
-    checkWidget();
-    return webBrowser.getUrl ();
-}
-
-/**
- * Returns the JavaXPCOM <code>nsIWebBrowser</code> for the receiver, or <code>null</code>
- * if it is not available.  In order for an <code>nsIWebBrowser</code> to be returned all
- * of the following must be true: <ul>
- *    <li>the receiver's style must be <code>DWT.MOZILLA</code></li>
- *    <li>the classes from JavaXPCOM &gt;= 1.8.1.2 must be resolvable at runtime</li>
- *    <li>the version of the underlying XULRunner must be &gt;= 1.8.1.2</li>
- * </ul> 
- *
- * @return the receiver's JavaXPCOM <code>nsIWebBrowser</code> or <code>null</code>
- * 
- * @since 3.3
- */
-public Object getWebBrowser () {
-    checkWidget();
-    return webBrowser.getWebBrowser ();
-}
-
-/**
- * Returns <code>true</code> if the receiver can navigate to the 
- * previous session history item, and <code>false</code> otherwise.
- *
- * @return the receiver's back command enabled state
- *
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @see #back
- */
-public bool isBackEnabled () {
-    checkWidget();
-    return webBrowser.isBackEnabled ();
-}
-
-public bool isFocusControl () {
-    checkWidget();
-    if (webBrowser.isFocusControl ()) return true;
-    return super.isFocusControl ();
-}
-
-/**
- * Returns <code>true</code> if the receiver can navigate to the 
- * next session history item, and <code>false</code> otherwise.
- *
- * @return the receiver's forward command enabled state
- *
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @see #forward
- */
-public bool isForwardEnabled () {
-    checkWidget();
-    return webBrowser.isForwardEnabled ();
-}
-
-/**
- * Refresh the current page.
- *
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.0
- */
-public void refresh () {
-    checkWidget();
-    webBrowser.refresh ();
-}
-
-/**  
- * Removes the listener from the collection of listeners who will
- * be notified when the window hosting the receiver should be closed.
- *
- * @param listener the listener which should no longer be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- * 
- * @since 3.0
- */
-public void removeCloseWindowListener (CloseWindowListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.removeCloseWindowListener (listener);
-}
-
-/**  
- * Removes the listener from the collection of listeners who will
- * be notified when the current location is changed or about to be changed.
- *
- * @param listener the listener which should no longer be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- * 
- * @since 3.0
- */
-public void removeLocationListener (LocationListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.removeLocationListener (listener);
-}
-
-/**  
- * Removes the listener from the collection of listeners who will
- * be notified when a new window needs to be created.
- *
- * @param listener the listener which should no longer be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- * 
- * @since 3.0
- */
-public void removeOpenWindowListener (OpenWindowListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.removeOpenWindowListener (listener);
-}
-
-/**  
- * Removes the listener from the collection of listeners who will
- * be notified when a progress is made during the loading of the current 
- * URL or when the loading of the current URL has been completed.
- *
- * @param listener the listener which should no longer be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- * 
- * @since 3.0
- */
-public void removeProgressListener (ProgressListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.removeProgressListener (listener);
-}
-
-/**  
- * Removes the listener from the collection of listeners who will
- * be notified when the status text is changed.
- *
- * @param listener the listener which should no longer be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- * 
- * @since 3.0
- */
-public void removeStatusTextListener (StatusTextListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.removeStatusTextListener (listener);
-}
-
-/**  
- * Removes the listener from the collection of listeners who will
- * be notified when the title of the current document is available
- * or has changed.
- *
- * @param listener the listener which should no longer be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- * 
- * @since 3.0
- */
-public void removeTitleListener (TitleListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.removeTitleListener (listener);
-}
-
-/**  
- * Removes the listener from the collection of listeners who will
- * be notified when a window hosting the receiver needs to be displayed
- * or hidden.
- *
- * @param listener the listener which should no longer be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- * 
- * @since 3.0
- */
-public void removeVisibilityWindowListener (VisibilityWindowListener listener) {
-    checkWidget();
-    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    webBrowser.removeVisibilityWindowListener (listener);
-}
-
-/**
- * Renders HTML.
- * 
- * <p>
- * The html parameter is Unicode encoded since it is a java <code>String</code>.
- * As a result, the HTML meta tag charset should not be set. The charset is implied
- * by the <code>String</code> itself.
- * 
- * @param html the HTML content to be rendered
- *
- * @return true if the operation was successful and false otherwise.
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the html is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *  
- * @see #setUrl
- * 
- * @since 3.0
- */
-public bool setText (String html) {
-    checkWidget();
-    if (html is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    return webBrowser.setText (html);
-}
-
-/**
- * Loads a URL.
- * 
- * @param url the URL to be loaded
- *
- * @return true if the operation was successful and false otherwise.
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the url is null</li>
- * </ul>
- * 
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *  
- * @see #getUrl
- * 
- * @since 3.0
- */
-public bool setUrl (String url) {
-    checkWidget();
-    if (url is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
-    return webBrowser.setUrl (url);
-}
-
-/**
- * Stop any loading and rendering activity.
- *
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
- *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
- * </ul>
- *
- * @since 3.0
- */
-public void stop () {
-    checkWidget();
-    webBrowser.stop ();
-}
-}

--- a/dwt/browser.old/CloseWindowListener.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.browser.CloseWindowListener;
-
-import dwt.dwthelper.utils;
-
-import dwt.internal.DWTEventListener;
-
-/**
- * This listener interface may be implemented in order to receive
- * a {@link WindowEvent} notification when a {@link Browser} is 
- * about to be closed and when its host window should be closed
- * by the application.
- * 
- * @see Browser#addCloseWindowListener(CloseWindowListener)
- * @see Browser#removeCloseWindowListener(CloseWindowListener)
- * @see OpenWindowListener
- * @see VisibilityWindowListener
- * 
- * @since 3.0
- */
-public interface CloseWindowListener : DWTEventListener {
-
-/**
- * This method is called when the window hosting a {@link Browser} should be closed.
- * Application would typically close the {@link dwt.widgets.Shell} that
- * hosts the <code>Browser</code>. The <code>Browser</code> is disposed after this
- * notification.
- *
- * <p>The following fields in the <code>WindowEvent</code> apply:
- * <ul>
- * <li>(in) widget the <code>Browser</code> that is going to be disposed
- * </ul></p>
- *
- * @param event the <code>WindowEvent</code> that specifies the <code>Browser</code>
- * that is going to be disposed
- * 
- * @see dwt.widgets.Shell#close()
- * 
- * @since 3.0
- */ 
-    public void close(WindowEvent event);
-}

--- a/dwt/browser.old/Download.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,388 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * Port to the D programming language:
- *     John Reimer <terminal.node@gmail.com>
- *******************************************************************************/
-module dwt.browser.Download;
-
-import dwt.dwthelper.utils;
-
-import dwt.DWT;
-import dwt.internal.C;
-import dwt.internal.Compatibility;
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMObject;
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIDownload;
-import dwt.internal.mozilla.nsIHelperAppLauncher;
-import dwt.internal.mozilla.nsILocalFile;
-import dwt.internal.mozilla.nsIProgressDialog;
-import dwt.internal.mozilla.nsISupports;
-import dwt.internal.mozilla.nsIURI;
-import dwt.internal.mozilla.nsIWebProgressListener;
-import dwt.layout.GridData;
-import dwt.layout.GridLayout;
-import dwt.widgets.Button;
-import dwt.widgets.Event;
-import dwt.widgets.Label;
-import dwt.widgets.Listener;
-import dwt.widgets.Shell;
-
-class Download {
-    XPCOMObject supports;
-    XPCOMObject download;
-    XPCOMObject progressDialog;
-    XPCOMObject webProgressListener;
-    nsIHelperAppLauncher helperAppLauncher;
-    int refCount = 0;
-
-    Shell shell;
-    Label status;
-    Button cancel;
-    
-Download () {
-    createCOMInterfaces ();
-}
-
-int AddRef () {
-    refCount++;
-    return refCount;
-}
-
-void createCOMInterfaces () {
-    /* Create each of the interfaces that this object implements */
-    supports = new XPCOMObject (new int[] {2, 0, 0}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-    };
-    
-    download = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
-        public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
-        public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
-        public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-        public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-        public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
-        public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
-        public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-        public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
-        public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
-        public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
-        public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
-    };
-    
-    progressDialog = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
-        public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
-        public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
-        public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-        public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-        public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
-        public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
-        public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-        public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
-        public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
-        public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
-        public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
-        public int /*long*/ method16 (int /*long*/[] args) {return Open (args[0]);}
-        public int /*long*/ method17 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-        public int /*long*/ method18 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-        public int /*long*/ method19 (int /*long*/[] args) {return GetDialog (args[0]);}
-        public int /*long*/ method20 (int /*long*/[] args) {return SetDialog (args[0]);}
-    };
-    
-    webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-        public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-        public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-        public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-    };
-}
-
-void disposeCOMInterfaces () {
-    if (supports !is null) {
-        supports.dispose ();
-        supports = null;
-    }   
-    if (download !is null) {
-        download.dispose ();
-        download = null;    
-    }
-    if (progressDialog !is null) {
-        progressDialog.dispose ();
-        progressDialog = null;
-    }
-    if (webProgressListener !is null) {
-        webProgressListener.dispose ();
-        webProgressListener = null;
-    }
-}
-
-int /*long*/ getAddress () {
-    return progressDialog.getAddress ();
-}
-
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
-    if (riid is 0 || ppvObject is 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-    nsID guid = new nsID ();
-    XPCOM.memmove (guid, riid, nsID.sizeof);
-
-    if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-        AddRef();
-        return XPCOM.NS_OK;
-    }
-    if (guid.Equals (nsIDownload.NS_IDOWNLOAD_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
-        AddRef();
-        return XPCOM.NS_OK;
-    }
-    if (guid.Equals (nsIProgressDialog.NS_IPROGRESSDIALOG_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
-        AddRef();
-        return XPCOM.NS_OK;
-    }
-    if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
-        AddRef();
-        return XPCOM.NS_OK;
-    }
-    XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
-    return XPCOM.NS_ERROR_NO_INTERFACE;
-}
-            
-int Release () {
-    refCount--;
-    if (refCount is 0) disposeCOMInterfaces ();
-    return refCount;
-}
-
-/* nsIDownload */
-
-/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aPersist) {
-    nsIURI source = new nsIURI (aSource);
-    int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
-    int rc = source.GetHost (aSpec);
-    if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-    int length = XPCOM.nsEmbedCString_Length (aSpec);
-    int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-    byte[] dest = new byte[length];
-    XPCOM.memmove (dest, buffer, length);
-    XPCOM.nsEmbedCString_delete (aSpec);
-    String url = new String (dest);
-
-    /*
-    * As of mozilla 1.7 the second argument of the nsIDownload interface's 
-    * Init function changed from nsILocalFile to nsIURI.  Detect which of
-    * these interfaces the second argument implements and act accordingly.  
-    */
-    String filename = null;
-    nsISupports supports = new nsISupports (aTarget);
-    int /*long*/[] result = new int /*long*/[1];
-    rc = supports.QueryInterface (nsIURI.NS_IURI_IID, result);
-    if (rc is 0) {  /* >= 1.7 */
-        nsIURI target = new nsIURI (result[0]);
-        result[0] = 0;
-        int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
-        rc = target.GetPath (aPath);
-        if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-        length = XPCOM.nsEmbedCString_Length (aPath);
-        buffer = XPCOM.nsEmbedCString_get (aPath);
-        dest = new byte[length];
-        XPCOM.memmove (dest, buffer, length);
-        XPCOM.nsEmbedCString_delete (aPath);
-        filename = new String (dest);
-        int separator = filename.lastIndexOf (System.getProperty ("file.separator"));   //$NON-NLS-1$
-        filename = filename.substring (separator + 1);
-        target.Release ();
-    } else {    /* < 1.7 */
-        nsILocalFile target = new nsILocalFile (aTarget);
-        int /*long*/ aNativeTarget = XPCOM.nsEmbedCString_new ();
-        rc = target.GetNativeLeafName (aNativeTarget);
-        if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-        length = XPCOM.nsEmbedCString_Length (aNativeTarget);
-        buffer = XPCOM.nsEmbedCString_get (aNativeTarget);
-        dest = new byte[length];
-        XPCOM.memmove (dest, buffer, length);
-        XPCOM.nsEmbedCString_delete (aNativeTarget);
-        filename = new String (dest);
-    }
-
-    Listener listener = new Listener () {
-        public void handleEvent (Event event) {
-            if (event.widget is cancel) {
-                shell.close ();
-            }
-            if (helperAppLauncher !is null) {
-                helperAppLauncher.Cancel ();
-                helperAppLauncher.Release ();
-            }
-            shell = null;
-            helperAppLauncher = null;
-        }
-    };
-    shell = new Shell (DWT.DIALOG_TRIM);
-    String msg = Compatibility.getMessage ("SWT_Download_File", new Object[] {filename}); //$NON-NLS-1$
-    shell.setText (msg);
-    GridLayout gridLayout = new GridLayout ();
-    gridLayout.marginHeight = 15;
-    gridLayout.marginWidth = 15;
-    gridLayout.verticalSpacing = 20;
-    shell.setLayout(gridLayout);
-    msg = Compatibility.getMessage ("SWT_Download_Location", new Object[] {filename, url}); //$NON-NLS-1$
-    new Label (shell, DWT.SIMPLE).setText (msg);
-    status = new Label (shell, DWT.SIMPLE);
-    msg = Compatibility.getMessage ("SWT_Download_Started"); //$NON-NLS-1$
-    status.setText (msg);
-    GridData data = new GridData ();
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = true;
-    status.setLayoutData (data);
-
-    cancel = new Button (shell, DWT.PUSH);
-    cancel.setText (DWT.getMessage ("SWT_Cancel")); //$NON-NLS-1$
-    data = new GridData ();
-    data.horizontalAlignment = GridData.CENTER;
-    cancel.setLayoutData (data);
-    cancel.addListener (DWT.Selection, listener);
-    shell.addListener (DWT.Close, listener);
-    shell.pack ();
-    shell.open ();
-    return XPCOM.NS_OK;
-}
-
-int GetSource (int /*long*/ aSource) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetTarget (int /*long*/ aTarget) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetPersist (int /*long*/ aPersist) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetPercentComplete (int /*long*/ aPercentComplete) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetDisplayName (int /*long*/ aDisplayName) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetDisplayName (int /*long*/ aDisplayName) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetStartTime (int /*long*/ aStartTime) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetMIMEInfo (int /*long*/ aMIMEInfo) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetListener (int /*long*/ aListener) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetListener (int /*long*/ aListener) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetObserver (int /*long*/ aObserver) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetObserver (int /*long*/ aObserver) {
-    if (aObserver !is 0) {
-        nsISupports supports = new nsISupports (aObserver);
-        int /*long*/[] result = new int /*long*/[1];
-        int rc = supports.QueryInterface (nsIHelperAppLauncher.NS_IHELPERAPPLAUNCHER_IID, result);
-        if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-        if (result[0] is 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-        helperAppLauncher = new nsIHelperAppLauncher (result[0]);
-    }
-    return XPCOM.NS_OK;
-}
-
-/* nsIProgressDialog */
-int Open (int /*long*/ aParent) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetDialog (int /*long*/ aDialog) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetDialog (int /*long*/ aDialog) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIWebProgressListener */
-
-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
-    if ((aStateFlags & nsIWebProgressListener.STATE_STOP) !is 0) {
-        if (helperAppLauncher !is null) helperAppLauncher.Release ();
-        helperAppLauncher = null;
-        if (shell !is null && !shell.isDisposed ()) shell.dispose ();
-        shell = null;
-    }
-    return XPCOM.NS_OK;
-}
-
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
-    int currentKBytes = aCurTotalProgress / 1024;
-    int totalKBytes = aMaxTotalProgress / 1024;
-    if (shell !is null && !shell.isDisposed ()) {
-        Object[] arguments = {new Integer (currentKBytes), new Integer (totalKBytes)};
-        String statusMsg = Compatibility.getMessage ("SWT_Download_Status", arguments); //$NON-NLS-1$
-        status.setText (statusMsg);
-        shell.layout (true);
-        shell.getDisplay ().update ();
-    }
-    return XPCOM.NS_OK;
-}
-
-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
-    return XPCOM.NS_OK;
-}
-
-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
-    return XPCOM.NS_OK;
-}
-
-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
-    return XPCOM.NS_OK;
-}
-}

--- a/dwt/browser.old/DownloadFactory.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * Port to the D programming language:
- *     John Reimer <terminal.node@gmail.com>
- *******************************************************************************/
-module dwt.browser.DownloadFactory;
-
-import dwt.dwthelper.utils;
-
-import dwt.browser.Download;
-
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIFactory;
-import dwt.internal.mozilla.nsISupports;
-
-class DownloadFactory : nsIFactory
-{
-    int _refCount = 0;
-
-    nsrefcnt AddRef () 
-    {
-        _refCount++;
-        return _refCount;
-    }
-
-    int QueryInterface ( ref nsIID riid, void** ppvObject) 
-    {
-        if (riid is null || ppvObject is null) 
-            return NS_ERROR_NO_INTERFACE;
-        
-        if ( riid == nsISupports.IID) 
-        {
-            *ppvObject = cast(void*)cast(nsISupports)this;
-            AddRef ();
-            return NS_OK;
-        }
-
-        if ( riid == nsIFactory.IID) 
-        {
-            *ppvObject = cast(void*)cast(nsIFactory)this;
-            AddRef ();
-            return NS_OK;
-        }
-    
-        *ppvObject = null;
-        return NS_ERROR_NO_INTERFACE;
-    }
-            
-    nsrefcnt Release () 
-    {
-        _refCount--;
-        if (_refCount is 0) 
-            _refCount = 0;
-    return _refCount;
-    }
-    
-/* nsIFactory */
-
-    nsresult CreateInstance ( nsISupports aOuter, nsIID* iid, void** result) 
-    {
-        Download download = new Download ();
-        download.AddRef ();
-        nsresult rv = download.QueryInterface( iid, result );
-        return rv;
-    }
-
-    nsresult LockFactory (int lock) 
-    {
-        return NS_OK;
-    }
-}

--- a/dwt/browser.old/DownloadFactory_1_8.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.browser.DownloadFactory_1_8;
-
-import dwt.dwthelper.utils;
-
-import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMObject;
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIFactory;
-import dwt.internal.mozilla.nsISupports;
-
-class DownloadFactory_1_8 {
-    XPCOMObject supports;
-    XPCOMObject factory;
-    int refCount = 0;
-
-DownloadFactory_1_8 () {
-    createCOMInterfaces ();
-}
-
-int AddRef () {
-    refCount++;
-    return refCount;
-}
-
-void createCOMInterfaces () {
-    /* Create each of the interfaces that this object implements */
-    supports = new XPCOMObject (new int[] {2, 0, 0}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-    };
-    
-    factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-    };
-}
-
-void disposeCOMInterfaces () {
-    if (supports !is null) {
-        supports.dispose ();
-        supports = null;
-    }   
-    if (factory !is null) {
-        factory.dispose ();
-        factory = null; 
-    }
-}
-
-int /*long*/ getAddress () {
-    return factory.getAddress ();
-}
-
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
-    if (riid is 0 || ppvObject is 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-    nsID guid = new nsID ();
-    XPCOM.memmove (guid, riid, nsID.sizeof);
-    
-    if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-        AddRef ();
-        return XPCOM.NS_OK;
-    }
-    if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
-        AddRef ();
-        return XPCOM.NS_OK;
-    }
-    
-    XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
-    return XPCOM.NS_ERROR_NO_INTERFACE;
-}
-            
-int Release () {
-    refCount--;
-    if (refCount is 0) disposeCOMInterfaces ();
-    return refCount;
-}
-
-/* nsIFactory */
-
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
-    Download_1_8 download = new Download_1_8 ();
-    download.AddRef ();
-    XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
-    return XPCOM.NS_OK;
-}
-
-int LockFactory (int lock) {
-    return XPCOM.NS_OK;
-}
-}

--- a/dwt/browser.old/Download_1_8.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.browser.Download_1_8;
-
-import dwt.dwthelper.utils;
-
-import dwt.DWT;
-import dwt.internal.C;
-import dwt.internal.Compatibility;
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMObject;
-import dwt.internal.mozilla.nsICancelable;
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIDownload_1_8;
-import dwt.internal.mozilla.nsIProgressDialog_1_8;
-import dwt.internal.mozilla.nsISupports;
-import dwt.internal.mozilla.nsIURI;
-import dwt.internal.mozilla.nsIWebProgressListener;
-import dwt.layout.GridData;
-import dwt.layout.GridLayout;
-import dwt.widgets.Button;
-import dwt.widgets.Event;
-import dwt.widgets.Label;
-import dwt.widgets.Listener;
-import dwt.widgets.Shell;
-
-class Download_1_8 {
-    XPCOMObject supports;
-    XPCOMObject download;
-    XPCOMObject progressDialog;
-    XPCOMObject webProgressListener;
-    nsICancelable cancelable;
-    int refCount = 0;
-
-    Shell shell;
-    Label status;
-    Button cancel;
-
-    static final bool is32 = C.PTR_SIZEOF is 4;
-
-Download_1_8 () {
-    createCOMInterfaces ();
-}
-
-int AddRef () {
-    refCount++;
-    return refCount;
-}
-
-void createCOMInterfaces () {
-    /* Create each of the interfaces that this object implements */
-    supports = new XPCOMObject (new int[] {2, 0, 0}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-    };
-
-    download = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-        public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-        public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-        public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-        public int /*long*/ method8 (int /*long*/[] args) {
-            if (args.length is 10) {
-                return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
-            } else {
-                return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
-            }
-        }
-        public int /*long*/ method9 (int /*long*/[] args) {
-            if (args.length is 8) {
-                return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
-            } else {
-                return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
-            }
-        }
-        public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
-        public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-        public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
-        public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
-        public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
-        public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
-        public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
-        public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-        public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
-        public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-    };
-
-    progressDialog = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-        public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-        public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-        public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-        public int /*long*/ method8 (int /*long*/[] args) {
-            if (args.length is 10) {
-                return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
-            } else {
-                return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
-            }
-        }
-        public int /*long*/ method9 (int /*long*/[] args) {
-            if (args.length is 8) {
-                return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
-            } else {
-                return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
-            }
-        }
-        public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
-        public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
-        public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
-        public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
-        public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
-        public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
-        public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
-        public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
-        public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
-        public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
-        public int /*long*/ method20 (int /*long*/[] args) {return Open (args[0]);}
-        public int /*long*/ method21 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
-        public int /*long*/ method22 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
-        public int /*long*/ method23 (int /*long*/[] args) {return GetObserver (args[0]);}
-        public int /*long*/ method24 (int /*long*/[] args) {return SetObserver (args[0]);}
-        public int /*long*/ method25 (int /*long*/[] args) {return GetDialog (args[0]);}
-        public int /*long*/ method26 (int /*long*/[] args) {return SetDialog (args[0]);}
-    };
-
-    webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
-        public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
-        public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
-        public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
-    };
-}
-
-void disposeCOMInterfaces() {
-    if (supports !is null) {
-        supports.dispose ();
-        supports = null;
-    }   
-    if (download !is null) {
-        download.dispose ();
-        download = null;    
-    }
-    if (progressDialog !is null) {
-        progressDialog.dispose ();
-        progressDialog = null;  
-    }
-    if (webProgressListener !is null) {
-        webProgressListener.dispose ();
-        webProgressListener = null; 
-    }
-}
-
-int /*long*/ getAddress () {
-    return progressDialog.getAddress ();
-}
-
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
-    if (riid is 0 || ppvObject is 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-    nsID guid = new nsID ();
-    XPCOM.memmove (guid, riid, nsID.sizeof);
-
-    if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-        AddRef();
-        return XPCOM.NS_OK;
-    }
-    if (guid.Equals (nsIDownload_1_8.NS_IDOWNLOAD_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
-        AddRef();
-        return XPCOM.NS_OK;
-    }
-    if (guid.Equals (nsIProgressDialog_1_8.NS_IPROGRESSDIALOG_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
-        AddRef();
-        return XPCOM.NS_OK;
-    }
-    if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
-        AddRef();
-        return XPCOM.NS_OK;
-    }
-    XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
-    return XPCOM.NS_ERROR_NO_INTERFACE;
-}
-
-int Release () {
-    refCount--;
-    if (refCount is 0) disposeCOMInterfaces ();
-    return refCount;
-}
-
-/* nsIDownload */
-
-/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
-int Init_32 (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aTempFile, int /*long*/ aCancelable) {
-    long startTime = (startTime2 << 32) + startTime1;
-    return Init (aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
-}
-
-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {
-    cancelable = new nsICancelable (aCancelable);
-    nsIURI source = new nsIURI (aSource);
-    int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
-    int rc = source.GetHost (aSpec);
-    if (rc !is XPCOM.NS_OK) Mozilla.error(rc);
-    int length = XPCOM.nsEmbedCString_Length (aSpec);
-    int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
-    byte[] dest = new byte[length];
-    XPCOM.memmove (dest, buffer, length);
-    XPCOM.nsEmbedCString_delete (aSpec);
-    String url = new String (dest);
-
-    nsIURI target = new nsIURI (aTarget);
-    int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
-    rc = target.GetPath (aPath);
-    if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-    length = XPCOM.nsEmbedCString_Length (aPath);
-    buffer = XPCOM.nsEmbedCString_get (aPath);
-    dest = new byte[length];
-    XPCOM.memmove (dest, buffer, length);
-    XPCOM.nsEmbedCString_delete (aPath);
-    String filename = new String (dest);
-    int separator = filename.lastIndexOf (System.getProperty ("file.separator"));   //$NON-NLS-1$
-    filename = filename.substring (separator + 1);
-
-    Listener listener = new Listener() {
-        public void handleEvent (Event event) {
-            if (event.widget is cancel) {
-                shell.close ();
-            }
-            if (cancelable !is null) {
-                int rc = cancelable.Cancel (XPCOM.NS_BINDING_ABORTED);
-                if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-            }
-            shell = null;
-            cancelable = null;
-        }
-    };
-    shell = new Shell (DWT.DIALOG_TRIM);
-    String msg = Compatibility.getMessage ("SWT_Download_File", new Object[] {filename}); //$NON-NLS-1$
-    shell.setText (msg);
-    GridLayout gridLayout = new GridLayout ();
-    gridLayout.marginHeight = 15;
-    gridLayout.marginWidth = 15;
-    gridLayout.verticalSpacing = 20;
-    shell.setLayout (gridLayout);
-    msg = Compatibility.getMessage ("SWT_Download_Location", new Object[] {filename, url}); //$NON-NLS-1$
-    new Label (shell, DWT.SIMPLE).setText (msg);
-    status = new Label (shell, DWT.SIMPLE);
-    msg = Compatibility.getMessage ("SWT_Download_Started"); //$NON-NLS-1$
-    status.setText (msg);
-    GridData data = new GridData ();
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = true;
-    status.setLayoutData (data);
-    
-    cancel = new Button (shell, DWT.PUSH);
-    cancel.setText (DWT.getMessage ("SWT_Cancel")); //$NON-NLS-1$
-    data = new GridData ();
-    data.horizontalAlignment = GridData.CENTER;
-    cancel.setLayoutData (data);
-    cancel.addListener (DWT.Selection, listener);
-    shell.addListener (DWT.Close, listener);
-    shell.pack ();
-    shell.open ();
-    return XPCOM.NS_OK;
-}
-
-int GetAmountTransferred (int /*long*/ arg0) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetCancelable (int /*long*/ arg0) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetDisplayName (int /*long*/ aDisplayName) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetMIMEInfo (int /*long*/ aMIMEInfo) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetPercentComplete (int /*long*/ aPercentComplete) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetSize (int /*long*/ arg0) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetSource (int /*long*/ aSource) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetStartTime (int /*long*/ aStartTime) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetTarget (int /*long*/ aTarget) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetTargetFile (int /*long*/ arg0) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIProgressDialog */
-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetDialog (int /*long*/ aDialog) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int GetObserver (int /*long*/ aObserver) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int Open (int /*long*/ aParent) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetDialog (int /*long*/ aDialog) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int SetObserver (int /*long*/ aObserver) {
-    return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIWebProgressListener */
-
-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
-    return XPCOM.NS_OK;
-}
-
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
-    return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
-}
-
-/* Note. The last 4 args in the original interface are defined as PRInt64. These each translate into two java ints. */
-int OnProgressChange64_32 (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aCurSelfProgress1, int /*long*/ aCurSelfProgress2, int /*long*/ aMaxSelfProgress1, int /*long*/ aMaxSelfProgress2, int /*long*/ aCurTotalProgress1, int /*long*/ aCurTotalProgress2, int /*long*/ aMaxTotalProgress1, int /*long*/ aMaxTotalProgress2) {
-    long aCurSelfProgress = (aCurSelfProgress2 << 32) + aCurSelfProgress1;
-    long aMaxSelfProgress = (aMaxSelfProgress2 << 32) + aMaxSelfProgress1;
-    long aCurTotalProgress = (aCurTotalProgress2 << 32) + aCurTotalProgress1;
-    long aMaxTotalProgress = (aMaxTotalProgress2 << 32) + aMaxTotalProgress1;
-    return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
-}
-
-int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
-    long currentKBytes = aCurTotalProgress / 1024;
-    long totalKBytes = aMaxTotalProgress / 1024;
-    if (shell !is null && !shell.isDisposed ()) {
-        Object[] arguments = {new Long (currentKBytes), new Long (totalKBytes)};
-        String statusMsg = Compatibility.getMessage ("SWT_Download_Status", arguments); //$NON-NLS-1$
-        status.setText (statusMsg);
-        shell.layout (true);
-        shell.getDisplay ().update ();
-    }
-    return XPCOM.NS_OK;
-}
-
-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
-    return XPCOM.NS_OK;
-}
-
-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
-    if ((aStateFlags & nsIWebProgressListener.STATE_STOP) !is 0) {
-        cancelable = null;
-        if (shell !is null && !shell.isDisposed ()) shell.dispose ();
-        shell = null;
-    }
-    return XPCOM.NS_OK;
-}   
-
-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
-    return XPCOM.NS_OK;
-}       
-}

--- a/dwt/browser.old/FilePicker.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * Port to the D programming language:
- *     John Reimer <terminal.node@gmail.com>
- *******************************************************************************/
-
-module dwt.browser.FilePicker;
-
-import tango.io.model.IFile;
-import Utf = tango.text.convert.Utf;
-
-import dwt.dwthelper.utils;
-
-import dwt.DWT;
-
-import XPCOM = dwt.internal.mozilla.nsXPCOM;
-
-import dwt.browser.Mozilla;
-import dwt.browser.MozillaDelegate;
-
-import dwt.internal.mozilla.nsEmbedString;
-import dwt.internal.mozilla.nsIDOMWindow;
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIFilePicker;
-import dwt.internal.mozilla.nsILocalFile;
-import dwt.internal.mozilla.nsISupports;
-import dwt.internal.mozilla.nsSimpleEnumerator;
-import dwt.internal.mozilla.nsStringAPI;
-import dwt.internal.mozilla.nsError;
-
-import dwt.widgets.DirectoryDialog;
-import dwt.widgets.Display;
-import dwt.widgets.FileDialog;
-import dwt.widgets.Shell;
-
-
-class FilePicker : nsISupports, nsIFilePicker 
-{
-    /**************************************************************************
-
-    **************************************************************************/
-    
-    private 
-    {
-        int      _refCount = 0;
-        short    _mode;
-
-        nsIDOMWindow _parent;
-
-        String[] _files;
-        String   _masks;
-        String   _defaultFilename, 
-                 _directory, 
-                 _title;
-    }
-    /**************************************************************************
-
-    **************************************************************************/
-
-    static final String SEPARATOR = FileConst.FileSeparatorChar;
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    this () 
-    {
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsrefcnt AddRef () 
-    {
-        _refCount++;
-        return _refCount;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult QueryInterface ( inout nsID riid, void** ppvObject) 
-    {   
-        if (riid is null || ppvObject is null) 
-            return NS_ERROR_NO_INTERFACE;
-    
-        if (riid == nsISupports.IID) 
-        {
-            *ppvObject = cast(void*)cast(nsISupports) this;
-            AddRef ();
-            return NS_OK;
-        }
-    
-        if (riid == nsIFilePicker.IID)) 
-        {
-            *ppvObject = cast(void*)cast(nsIFilePicker) this;
-            AddRef ();
-            return NS_OK;
-        }
-    
-        if (riid == nsIFilePicker_1_8.IID) 
-        {
-            *ppvObject = cast(void*)cast(nsIFilePicker_1_8) this;
-            AddRef ();
-            return NS_OK;
-        }
-
-        *ppvObject = null; 
-        return NS_ERROR_NO_INTERFACE;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsrefcnt Release () 
-    {
-        _refCount--;
-        
-        if (_refCount is 0) 
-            // No big deal here; just allow the GC to reap this object
-            // once all references are expired. -JJR
-            // delete this;
-            return 0;
-        
-        return _refCount;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    /* SWT Comment:
-     *
-     * As of Mozilla 1.8 some of nsIFilePicker's string arguments changed type.  This method
-     * answers a java string based on the type of string that is appropriate for the Mozilla
-     * version being used.
-     */
-
-    override String parseAString (nsEmbedString str) 
-    {
-        return null;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    /* nsIFilePicker */
-
-    nsresult Init (nsIDOMWindow parent, nsAString* title, PRInt16 mode) 
-    {
-        _parent = parent;
-        _mode = mode;
-        _title = parseAString (title);
-        return XPCOM;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult Show (PRUint32* retval) 
-    {
-        if (_mode is nsIFilePicker.modeGetFolder) 
-        {
-            /* picking a directory */
-            int result = this.showDirectoryPicker ();
-            *retval = result;
-            return NS_OK;
-        }
-
-        /* picking a file */
-        int style = _mode is nsIFilePicker.modeSave ? DWT.SAVE : DWT.OPEN;
-
-        if (_mode is nsIFilePicker.modeOpenMultiple) 
-            style |= DWT.MULTI;
-
-        Display display = Display.getCurrent ();
-        Shell parent = null; // TODO compute parent
-
-        if (parent is null) 
-        {
-            parent = new Shell (display);
-        }
-
-        FileDialog dialog = new FileDialog (parent, style);
-        
-        if (_title !is null) 
-            dialog.setText (_title);
-        
-        if (_directory !is null) 
-            dialog.setFilterPath (_directory);
-        
-        if (_masks !is null) {
-            String[] str ~= _masks;
-            dialog.setFilterExtensions ( str );
-        }
-        
-        if (_defaultFilename !is null) 
-            dialog.setFileName (_defaultFilename);
-        
-        String filename = dialog.open ();
-        files = dialog.getFileNames ();
-        _directory = dialog.getFilterPath ();
-        _title = _defaultFilename = null;
-        _masks = null;
-        int result = filename is null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK; 
-        *retval = result;
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    int showDirectoryPicker () 
-    {
-        Display display = Display.getCurrent ();
-        Shell parent = null; // TODO compute parent
-        
-        if (parent is null) 
-        {
-            parent = new Shell (display);
-        }
-        
-        DirectoryDialog dialog = new DirectoryDialog (parent, DWT.NONE);
-        
-        if (_title !is null) 
-            dialog.setText (_title);
-        if (_directory !is null) 
-            dialog.setFilterPath (_directory);
-        _directory = dialog.open ();
-        _title = _defaultFilename = null;
-        _files = _masks = null;
-        return _directory is null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult GetFiles ( nsISimpleEnumerator* aFiles) 
-    {
-        return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult GetFileURL (nsIFileURL aFileURL) 
-    {
-        return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult GetFile (nsILocalFile* aFile) 
-    {
-        String filename = "";   //$NON-NLS-1$
-        
-        if (_directory !is null) 
-            filename ~= _directory ~ SEPARATOR;
-        if (_files !is null && _files.length > 0) 
-            filename ~= _files[0];
-        
-        // Create a nsEmbedString which will be automatically disposed 
-        // at the end of scope.
-        scope auto path = new nsEmbedString( filename );
-        
-        nsresult rc = XPCOM.NS_NewLocalFile ( cast(nsAString*)path, 1, aFile);
-
-        if (rc !is NS_OK) 
-            Mozilla.error (rc);
-        if (aFile is null) 
-            Mozilla.error (NS_ERROR_NULL_POINTER);
-
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult SetDisplayDirectory (nsILocalFile aDisplayDirectory) 
-    {
-        if (aDisplayDirectory is null) 
-            return NS_OK;
-        
-        scope auto pathname = new nsEmbedCString;
-        aDisplayDirectory.GetNativePath ( cast(nsACString*)pathname );
-        // TODO: CHECK IF THIS DOES CORRECT STRING CONVERSION -JJR
-        char[] buffer = pathname.toString();
-        char[] chars = MozillaDelegate.mbcsToWcs (null, buffer);
-        // "buffer" contains a dup'ed string so we can safely reuse
-        // it's memory for the _directory member. -JJR
-        _directory = buffer;
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult GetDisplayDirectory (nsILocalFile* aDisplayDirectory) 
-    {
-        String directoryName = _directory !is null ? _directory : ""; //$NON-NLS-1$
-        scope auto path = new nsEmbedString (directoryName);
-        nsresult rc = XPCOM.NS_NewLocalFile ( cast(nsAString*)path, 1, aDisplayDirectory);
-        
-        if (rc !is NS_OK) 
-            Mozilla.error (rc);
-        if (aDisplayDirectory is null) 
-            Mozilla.error (NS_ERROR_NULL_POINTER);
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult SetFilterIndex (PRInt32 aFilterIndex) 
-    {
-        return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nresult GetFilterIndex (PRInt32* aFilterIndex) 
-    {
-        return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    int SetDefaultExtension (nsAString* aDefaultExtension) 
-    {
-        /* note that the type of argument 1 changed as of Mozilla 1.8 */
-        return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    int GetDefaultExtension (nsAString* aDefaultExtension) 
-    {
-        /* note that the type of argument 1 changed as of Mozilla 1.8 */
-        return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nresult SetDefaultString (nsAString* aDefaultString) 
-    {
-        defaultFilename = parseAString (aDefaultString);
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nresult GetDefaultString (nsAString* aDefaultString) 
-    {
-        /* note that the type of argument 1 changed as of Mozilla 1.8 */
-        return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nresult AppendFilter (nsAString* title, nsAString* filter)
-    {
-        /* note that the type of arguments 1 and 2 changed as of Mozilla 1.8 */
-        return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nresult AppendFilters (PRInt32 filterMask) 
-    {
-        String addFilters;
-        
-        switch (filterMask) 
-        {
-            case nsIFilePicker.filterAll:
-            case nsIFilePicker.filterApps:
-                _masks = null;           /* this is equivalent to no filter */
-                break;
-            case nsIFilePicker.filterHTML:
-                addFilters = "*.htm;*.html" ;
-                break;
-            case nsIFilePicker.filterImages:
-                addFilters = "*.gif;*.jpeg;*.jpg;*.png";
-                break;
-            case nsIFilePicker.filterText:
-                addFilters = "*.txt";
-                break;
-            case nsIFilePicker.filterXML:
-                addFilters = "*.xml";
-                break;
-            case nsIFilePicker.filterXUL:
-                addFilters = "*.xul";
-                break;
-        }
-    
-        if (_masks is null) 
-        {
-            _masks = addFilters;
-        } else {
-            if (addFilters !is null)
-                _masks ~= addFilters;
-        }
-        return NS_OK;
-    }
-
-/******************************************************************************
-
-    FilePicker for Mozilla Version 1.8
-
-******************************************************************************/
-
-class FilePicker_1_8 : FilePicker
-{
-    String parseAString (nsEmbedString str) 
-    {
-        if (str is null) 
-            return null;
-        return Utf.toString( str.toString16() );
-    }
-}
\ No newline at end of file

--- a/dwt/browser.old/FilePickerFactory.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * Port to the D programming language:
- *     John Reimer <terminal.node@gmail.com>
- *******************************************************************************/
-
-module dwt.browser.FilePickerFactory;
-
-import dwt.dwthelper.utils;
-
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.
-import dwt.internal.mozilla.nsIFactory;
-import dwt.internal.mozilla.nsISupports;
-
-class FilePickerFactory : nsISupports, nsIFactory 
-{
-
-    /**************************************************************************
-
-    **************************************************************************/
-    
-    int _refCount = 0;
-    
-    /**************************************************************************
-
-    **************************************************************************/
-
-    this () 
-    {
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsrefcnt AddRef () 
-    {
-        _refCount++;
-        return _refCount;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    int QueryInterface ( ref nsID riid, void** ppvObject)
-    {
-        if (riid is null || ppvObject is null) 
-            return NS_ERROR_NO_INTERFACE;
-        
-        if (guid == nsISupports.IID)) 
-        {
-            *ppvObject = cast(void*)cast(nsISupports) this; 
-            AddRef ();
-            return NS_OK;
-        }
-    
-        if (guid == nsIFactory.IID) 
-        {
-            *ppvObject = cast(void*)cast(nsIFactory) this;
-            AddRef ();
-            return NS_OK;
-        }
-    
-        *ppvObject = null;
-        return NS_ERROR_NO_INTERFACE;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsrefcnt Release () 
-    {
-        _refCount--;
-        if (_refCount is 0) 
-            return 0;
-        return _refCount;
-    }
-    
-    /**************************************************************************
-
-    **************************************************************************/
-
-    /* nsIFactory */
-
-    nsresult CreateInstance (nsISupports aOuter, nsIID* iid, void** result) 
-    {
-        if (result is null)
-            return NS_ERROR_INVALID_ARG;
-
-        FilePicker picker = new FilePicker ();
-        picker.AddRef ();
-
-        nsresult rv = picker.QueryInterface( iid, result );
-        
-        // TODO: If the query fails, the error should be checked and the 
-        //       newly created object deleted. In C++, this is done
-        //       like so:
-        //
-        //      if (NS_FAILED(rv)) {
-        //          *result = nsnull;
-        //          delete picker;
-        //      }
-        //
-        // Deletion of the object really isn't critical here for D, but
-        // it may be considered "good habit" to do anyway for XPCOM objects.
-        // For now, just return the rv value.  NS_FAILED needs to be
-        // ported first. -JJR
-
-        return rv;
-    }
-
-    nsresult LockFactory (int lock) 
-    {
-        return NS_OK;
-    }
-
-}
\ No newline at end of file

--- a/dwt/browser.old/FilePickerFactory_1_8.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.browser.FilePickerFactory_1_8;
-
-import dwt.dwthelper.utils;
-
-import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMObject;
-
-class FilePickerFactory_1_8 extends FilePickerFactory {
-
-void createCOMInterfaces () {
-    /* Create each of the interfaces that this object implements */
-    supports = new XPCOMObject (new int[] {2, 0, 0}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-    };
-    
-    factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-    };
-}
-
-/* nsIFactory */
-
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
-    FilePicker_1_8 picker = new FilePicker_1_8 ();
-    picker.AddRef ();
-    XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
-    return XPCOM.NS_OK;
-}
-
-}

--- a/dwt/browser.old/FilePicker_1_8.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.browser.FilePicker_1_8;
-
-import dwt.dwthelper.utils;
-
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMObject;
-
-class FilePicker_1_8 extends FilePicker {
-
-void createCOMInterfaces () {
-    /* Create each of the interfaces that this object implements */
-    supports = new XPCOMObject (new int[] {2, 0, 0}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-    };
-
-    filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
-        public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
-        public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
-        public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
-        public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
-        public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
-        public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
-        public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
-        public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
-        public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
-        public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
-        public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
-        public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
-        public int /*long*/ method17 (int /*long*/[] args) {return Show (args[0]);}
-    };
-}
-
-/*
- * As of Mozilla 1.8 some of nsIFilePicker's string arguments changed type.  This method
- * answers a java string based on the type of string that is appropriate for the Mozilla
- * version being used.
- */
-String parseAString (int /*long*/ string) {
-    if (string is 0) return null;
-    int length = XPCOM.nsEmbedString_Length (string);
-    int /*long*/ buffer = XPCOM.nsEmbedString_get (string);
-    char[] chars = new char[length];
-    XPCOM.memmove (chars, buffer, length * 2);
-    return new String (chars);
-}
-}

--- a/dwt/browser.old/HelperAppLauncherDialog.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.browser.HelperAppLauncherDialog;
-
-import dwt.dwthelper.utils;
-
-import dwt.DWT;
-import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMObject;
-import dwt.internal.mozilla.nsEmbedString;
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIHelperAppLauncher;
-import dwt.internal.mozilla.nsIHelperAppLauncherDialog;
-import dwt.internal.mozilla.nsIHelperAppLauncher_1_8;
-import dwt.internal.mozilla.nsIHelperAppLauncher_1_9;
-import dwt.internal.mozilla.nsISupports;
-import dwt.widgets.FileDialog;
-import dwt.widgets.Shell;
-
-class HelperAppLauncherDialog {
-    XPCOMObject supports;
-    XPCOMObject helperAppLauncherDialog;
-    int refCount = 0;
-
-HelperAppLauncherDialog () {
-    createCOMInterfaces ();
-}
-
-int AddRef () {
-    refCount++;
-    return refCount;
-}
-
-void createCOMInterfaces () {
-    /* Create each of the interfaces that this object implements */
-    supports = new XPCOMObject (new int[] {2, 0, 0}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-    };
-    
-    helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 5}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
-    };      
-}
-
-void disposeCOMInterfaces () {
-    if (supports !is null) {
-        supports.dispose ();
-        supports = null;
-    }   
-    if (helperAppLauncherDialog !is null) {
-        helperAppLauncherDialog.dispose ();
-        helperAppLauncherDialog = null; 
-    }
-}
-
-int /*long*/ getAddress () {
-    return helperAppLauncherDialog.getAddress ();
-}
-
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
-    if (riid is 0 || ppvObject is 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-    nsID guid = new nsID ();
-    XPCOM.memmove (guid, riid, nsID.sizeof);
-    
-    if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-        AddRef ();
-        return XPCOM.NS_OK;
-    }
-    if (guid.Equals (nsIHelperAppLauncherDialog.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
-        AddRef ();
-        return XPCOM.NS_OK;
-    }
-    
-    XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
-    return XPCOM.NS_ERROR_NO_INTERFACE;
-}
-            
-int Release () {
-    refCount--;
-    /*
-    * Note.  This instance lives as long as the download it is binded to.
-    * Its reference count is expected to go down to 0 when the download
-    * has completed or when it has been cancelled. E.g. when the user
-    * cancels the File Dialog, cancels or closes the Download Dialog
-    * and when the Download Dialog goes away after the download is completed.
-    */
-    if (refCount is 0) disposeCOMInterfaces ();
-    return refCount;
-}
-
-/* nsIHelperAppLauncherDialog */
-
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
-    /*
-    * The interface for nsIHelperAppLauncher changed in GRE versions 1.8 and 1.9.  Query for
-    * each of these interfaces in turn until one is found.
-    */
-    nsISupports supports = new nsISupports (aLauncher);
-    int /*long*/[] result = new int /*long*/[1];
-    int rc = supports.QueryInterface (nsIHelperAppLauncher_1_9.NS_IHELPERAPPLAUNCHER_IID, result);
-    if (rc is 0) {
-        nsIHelperAppLauncher_1_9 helperAppLauncher = new nsIHelperAppLauncher_1_9 (aLauncher);
-        rc = helperAppLauncher.SaveToDisk (0, 0);
-        helperAppLauncher.Release ();
-        return rc;
-    }
-
-    result[0] = 0;
-    rc = supports.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
-    if (rc is 0) {
-        nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
-        rc = helperAppLauncher.SaveToDisk (0, 0);
-        helperAppLauncher.Release ();
-        return rc;
-    }
-
-    nsIHelperAppLauncher helperAppLauncher = new nsIHelperAppLauncher (aLauncher);  /* < 1.8 */
-    return helperAppLauncher.SaveToDisk (0, 0);
-}
-
-int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
-    int /*long*/ aDefaultFile, aSuggestedFileExtension, _retval;
-    bool hasLauncher = false;
-
-    /*
-    * The interface for nsIHelperAppLauncherDialog changed as of mozilla 1.5 when an
-    * extra argument was added to the PromptForSaveToFile method (this resulted in all
-    * subsequent arguments shifting right).  The workaround is to provide an XPCOMObject 
-    * that fits the newer API, and to use the first argument's type to infer whether
-    * the old or new nsIHelperAppLauncherDialog interface is being used (and by extension
-    * the ordering of the arguments).  In mozilla >= 1.5 the first argument is an
-    * nsIHelperAppLauncher. 
-    */
-    /*
-     * The interface for nsIHelperAppLauncher changed as of mozilla 1.8, so the first
-     * argument must be queried for both the old and new nsIHelperAppLauncher interfaces. 
-     */
-    bool using_1_8 = false, using_1_9 = false;
-    nsISupports support = new nsISupports (arg0);
-    int /*long*/[] result = new int /*long*/[1];
-    int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
-    if (rc is 0) {
-        using_1_8 = true;
-        hasLauncher = true;
-        new nsISupports (result[0]).Release ();
-    } else {
-        result[0] = 0;
-        rc = support.QueryInterface (nsIHelperAppLauncher_1_9.NS_IHELPERAPPLAUNCHER_IID, result);
-        if (rc is 0) {
-            using_1_9 = true;
-            hasLauncher = true;
-            new nsISupports (result[0]).Release ();
-        } else {
-            result[0] = 0;
-            rc = support.QueryInterface (nsIHelperAppLauncher.NS_IHELPERAPPLAUNCHER_IID, result);
-            if (rc is 0) {
-                hasLauncher = true;
-                new nsISupports (result[0]).Release ();
-            }
-        }
-    }
-    result[0] = 0;
-
-    if (hasLauncher) {  /* >= 1.5 */
-        aDefaultFile = arg2;
-        aSuggestedFileExtension = arg3;
-        _retval = arg4;
-    } else {            /* 1.4 */
-        aDefaultFile = arg1;
-        aSuggestedFileExtension = arg2;
-        _retval = arg3;
-    }
-
-    int length = XPCOM.strlen_PRUnichar (aDefaultFile);
-    char[] dest = new char[length];
-    XPCOM.memmove (dest, aDefaultFile, length * 2);
-    String defaultFile = new String (dest);
-
-    length = XPCOM.strlen_PRUnichar (aSuggestedFileExtension);
-    dest = new char[length];
-    XPCOM.memmove (dest, aSuggestedFileExtension, length * 2);
-    String suggestedFileExtension = new String (dest);
-
-    Shell shell = new Shell ();
-    FileDialog fileDialog = new FileDialog (shell, DWT.SAVE);
-    fileDialog.setFileName (defaultFile);
-    fileDialog.setFilterExtensions (new String[] {suggestedFileExtension});
-    String name = fileDialog.open ();
-    shell.close ();
-    if (name is null) {
-        if (hasLauncher) {
-            if (using_1_8) {
-                nsIHelperAppLauncher_1_8 launcher = new nsIHelperAppLauncher_1_8 (arg0);
-                rc = launcher.Cancel (XPCOM.NS_BINDING_ABORTED);
-            } else if (using_1_9) {
-                nsIHelperAppLauncher_1_9 launcher = new nsIHelperAppLauncher_1_9 (arg0);
-                rc = launcher.Cancel (XPCOM.NS_BINDING_ABORTED);
-            } else {
-                nsIHelperAppLauncher launcher = new nsIHelperAppLauncher (arg0);
-                rc = launcher.Cancel ();
-            }
-            if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-            return XPCOM.NS_OK;
-        }
-        return XPCOM.NS_ERROR_FAILURE;
-    }
-    nsEmbedString path = new nsEmbedString (name);
-    rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
-    path.dispose ();
-    if (rc !is XPCOM.NS_OK) Mozilla.error (rc);
-    if (result[0] is 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
-    /* Our own nsIDownload has been registered during the Browser initialization. It will be invoked by Mozilla. */
-    XPCOM.memmove (_retval, result, C.PTR_SIZEOF);  
-    return XPCOM.NS_OK;
-}
-}

--- a/dwt/browser.old/HelperAppLauncherDialogFactory.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.browser.HelperAppLauncherDialogFactory;
-
-import dwt.dwthelper.utils;
-
-import dwt.internal.C;
-import dwt.internal.mozilla.XPCOM;
-import dwt.internal.mozilla.XPCOMObject;
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIFactory;
-import dwt.internal.mozilla.nsISupports;
-
-class HelperAppLauncherDialogFactory {
-    XPCOMObject supports;
-    XPCOMObject factory;
-    int refCount = 0;
-
-HelperAppLauncherDialogFactory () {
-    createCOMInterfaces ();
-}
-
-int AddRef () {
-    refCount++;
-    return refCount;
-}
-
-void createCOMInterfaces () {
-    /* Create each of the interfaces that this object implements */
-    supports = new XPCOMObject (new int[] {2, 0, 0}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-    };
-    
-    factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
-        public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
-        public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
-        public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
-        public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
-        public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
-    };
-}
-
-void disposeCOMInterfaces () {
-    if (supports !is null) {
-        supports.dispose ();
-        supports = null;
-    }   
-    if (factory !is null) {
-        factory.dispose ();
-        factory = null; 
-    }
-}
-
-int /*long*/ getAddress () {
-    return factory.getAddress ();
-}
-
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
-    if (riid is 0 || ppvObject is 0) return XPCOM.NS_ERROR_NO_INTERFACE;
-    nsID guid = new nsID ();
-    XPCOM.memmove (guid, riid, nsID.sizeof);
-    
-    if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
-        AddRef ();
-        return XPCOM.NS_OK;
-    }
-    if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
-        XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
-        AddRef ();
-        return XPCOM.NS_OK;
-    }
-    
-    XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
-    return XPCOM.NS_ERROR_NO_INTERFACE;
-}
-            
-int Release () {
-    refCount--;
-    if (refCount is 0) disposeCOMInterfaces ();
-    return refCount;
-}
-    
-/* nsIFactory */
-
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
-    HelperAppLauncherDialog helperAppLauncherDialog = new HelperAppLauncherDialog ();
-    helperAppLauncherDialog.AddRef ();
-    XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
-    return XPCOM.NS_OK;
-}
-
-int LockFactory (int lock) {
-    return XPCOM.NS_OK;
-}
-}

--- a/dwt/browser.old/InputStream.d	Tue Aug 05 18:00:50 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * Port to the D programming language:
- *     John Reimer <terminal.node@gmail.com>
- *******************************************************************************/
-
-module dwt.browser.InputStream;
-
-import dwt.dwthelper.utils;
-
-import dwt.internal.mozilla.nsError;
-import dwt.internal.mozilla.nsID;
-import dwt.internal.mozilla.nsIInputStream;
-import dwt.internal.mozilla.nsISupports;
-
-import Math = tango.math.Math;
-
-/******************************************************************************
-
-    COMMENTS: SWT implements this class as a replacement for the XPCOM 
-    implementation; it may be possible to use the XPCOM one instead 
-    (which also may be safer for D), but for now we'll follow SWT's example 
-    and use this reimplementation of InputStream. It should be trivial to
-    move over to strict XPCOM implementation should the need arise. It appears 
-    that the Java SWT source uses many workarounds in order to use the XPCOM 
-    interface. For D, I remove much of the Java layered callback
-    approach since it is no longer necessary.  -JJR
-
-******************************************************************************/
-
-class InputStream : nsIInputStream
-{
-    int     _refCount = 0;
-    int     _index     = 0;
-    byte[]  _buffer;
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    this (byte[] buffer) 
-    {
-        this._buffer = buffer;
-        index = 0;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsrefcnt AddRef () 
-    {
-        _refCount++;
-        return _refCount;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult QueryInterface ( inout nsID riid, void** ppvObject) 
-    {
-        if (riid is null || ppvObject is null) 
-            return NS_ERROR_NO_INTERFACE;
-        
-        nsID guid = riid;
-    
-        if (guid == nsISupports.NS_ISUPPORTS_IID) 
-        {
-            *ppvObject = cast(void*)cast(nsISupports) this;
-            this.AddRef ();
-            return NS_OK;
-        }
-
-        if (guid == nsIInputStream.NS_IINPUTSTREAM_IID) 
-        {
-            *ppvObject = cast(void*)cast(nsIInputStream) this;
-            this.AddRef ();
-            return NS_OK;
-        }   
-    
-        *ppvObject = null;
-        return NS_ERROR_NO_INTERFACE;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsrefcnt Release () 
-    {
-        _refCount--;
-        if (_refCount is 0) 
-            return 0 
-           // delete this;
-        return _refCount;
-    }
-    
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult Close () 
-    {
-        _buffer = null;
-        _index = 0;
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult Available ( PRUint32* retval) 
-    {
-        PRUint32 available = buffer is null ? 0 : buffer.length - _index;
-        *retval = available;
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult Read(byte* aBuf, PRUint32 aCount, PRUint32* retval) 
-    {
-        int max = Math.min (aCount, _buffer is null ? 0 : _buffer.length - _index);
-        
-        if (max > 0) 
-        {
-            aBuf[0..max] = _buffer[_index..$];
-            _index += max;
-        }
-
-        *retval = max;
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult ReadSegments (nsWriteSegmentFun aWriter, void* aClosure, PRUint32 aCount, PRUint32*  retval) 
-    {
-        int      max = Math.min (aCount, buffer is null ? 0 : buffer.length - _index);
-        PRUint32 cnt = max;
-        
-        while (cnt > 0) 
-        {
-            PRUint32 aWriteCount;
-            nsresult rc = aWriter ( cast(nsIInputStream)this, aClosure, buffer.ptr, _index, cnt, &aWriteCount);
-            if (rc !is NS_OK) break;
-            _index += aWriteCount;
-            cnt -= aWriteCount;
-        }
-
-        *retval = (max - cnt);
-        return NS_OK;
-    }
-
-    /**************************************************************************
-
-    **************************************************************************/
-
-    nsresult IsNonBlocking ( PRUint32* retval) 
-    {
-        *retval = 0;
-        return NS_OK;
-    } 
-}