Ended the use of strings to describe files in the file widget API. Made some nsString input parameters const.

widget/public/nsIFileWidget.h

@@ -63,6 +63,8 @@ class nsIFileWidget : public nsISupports
 public:
 
   
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFILEWIDGET_IID)
+
  /**
   * Create the file filter. This differs from the standard
   * widget Create method because it passes in the mode
@@ -74,7 +76,7 @@ public:
   *
   */
   NS_IMETHOD Create(nsIWidget *aParent,
-                      nsString& aTitle,
+                      const nsString& aTitle,
                       nsFileDlgMode aMode,
                       nsIDeviceContext *aContext = nsnull,
                       nsIAppShell *aAppShell = nsnull,
@@ -103,14 +105,6 @@ public:
 
   virtual PRBool Show() = 0;
 
- /**
-  * Get the file or directory including the full path.
-  *
-  * @param aFile on exit it contains the file or directory selected
-  */
-  
-  NS_IMETHOD GetFile(nsString& aFile) = 0;
- 
  /**
   * Get the nsFileSpec for the file or directory.
   *
@@ -127,7 +121,7 @@ public:
   * @return     void
   *
   */
-  NS_IMETHOD SetDefaultString(nsString& aString) = 0;
+  NS_IMETHOD SetDefaultString(const nsString& aString) = 0;
 
  /**
   * Set the directory that the file open/save dialog initially displays
@@ -136,7 +130,7 @@ public:
   * @return     void
   *
   */
-  NS_IMETHOD SetDisplayDirectory(nsString& aDirectory) = 0;
+  NS_IMETHOD SetDisplayDirectory(const nsFileSpec& aDirectory) = 0;
 
  /**
   * Get the directory that the file open/save dialog was last displaying
@@ -145,22 +139,22 @@ public:
   * @return     void
   *
   */
-  NS_IMETHOD GetDisplayDirectory(nsString& aDirectory) = 0;
+  NS_IMETHOD GetDisplayDirectory(nsFileSpec& aDirectory) = 0;
 
 
   virtual nsFileDlgResults GetFile(
     nsIWidget        * aParent,
-    nsString         & promptString,    // Window title for the dialog
+    const nsString   & promptString,    // Window title for the dialog
     nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog
     
   virtual nsFileDlgResults GetFolder(
     nsIWidget        * aParent,
-    nsString         & promptString,    // Window title for the dialog
+    const nsString   & promptString,    // Window title for the dialog
     nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog 
     
   virtual nsFileDlgResults PutFile(
     nsIWidget        * aParent,
-    nsString         & promptString,    // Window title for the dialog
+    const nsString   & promptString,    // Window title for the dialog
     nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog 
 };
 

widget/src/mac/nsFileWidget.cpp

@@ -57,7 +57,7 @@ NS_IMETHODIMP nsFileWidget::Create(nsIWidget        *aParent,
 
 //-------------------------------------------------------------------------
 NS_IMETHODIMP   nsFileWidget:: Create(nsIWidget  *aParent,
-                             nsString&   aTitle,
+                             const nsString&   aTitle,
                              nsFileDlgMode    aMode,
                              nsIDeviceContext *aContext,
                              nsIAppShell *aAppShell,
@@ -461,13 +461,6 @@ NS_IMETHODIMP nsFileWidget::SetFilterList(PRUint32 aNumberOfFilters,const nsStri
 //
 //-------------------------------------------------------------------------
 
-NS_IMETHODIMP  nsFileWidget::GetFile(nsString& aFile)
-{
-  aFile.SetLength(0);
-  aFile.Append(mFile);
-  return NS_OK;
-}
-
 NS_IMETHODIMP  nsFileWidget::GetFile(nsFileSpec& aFile)
 {
   aFile = mFileSpec;
@@ -480,7 +473,7 @@ NS_IMETHODIMP  nsFileWidget::GetFile(nsFileSpec& aFile)
 //
 //-------------------------------------------------------------------------
 
-NS_IMETHODIMP  nsFileWidget::SetDefaultString(nsString& aString)
+NS_IMETHODIMP  nsFileWidget::SetDefaultString(const nsString& aString)
 {
   mDefault = aString;
   return NS_OK;
@@ -491,7 +484,7 @@ NS_IMETHODIMP  nsFileWidget::SetDefaultString(nsString& aString)
 // Set the display directory
 //
 //-------------------------------------------------------------------------
-NS_METHOD  nsFileWidget::SetDisplayDirectory(nsString& aDirectory)
+NS_METHOD  nsFileWidget::SetDisplayDirectory(const nsFileSpec& aDirectory)
 {
   mDisplayDirectory = aDirectory;
   return NS_OK;
@@ -503,7 +496,7 @@ NS_METHOD  nsFileWidget::SetDisplayDirectory(nsString& aDirectory)
 //
 //-------------------------------------------------------------------------
 
-NS_METHOD  nsFileWidget::GetDisplayDirectory(nsString& aDirectory)
+NS_METHOD  nsFileWidget::GetDisplayDirectory(nsFileSpec& aDirectory)
 {
   aDirectory = mDisplayDirectory;
   return NS_OK;
@@ -512,7 +505,7 @@ NS_METHOD  nsFileWidget::GetDisplayDirectory(nsString& aDirectory)
 
 nsFileDlgResults  nsFileWidget::GetFile(
 	    nsIWidget        * aParent,
-	    nsString         & promptString,
+	    const nsString   & promptString,
 	    nsFileSpec       & theFileSpec)
 {
 	Create(aParent, promptString, eMode_load, nsnull, nsnull);
@@ -527,7 +520,7 @@ nsFileDlgResults  nsFileWidget::GetFile(
 	    
 nsFileDlgResults  nsFileWidget::GetFolder(
 	    nsIWidget        * aParent,
-	    nsString         & promptString,
+	    const nsString   & promptString,
 	    nsFileSpec       & theFileSpec)
 {
 	Create(aParent, promptString, eMode_getfolder, nsnull, nsnull);
@@ -542,7 +535,7 @@ nsFileDlgResults  nsFileWidget::GetFolder(
 	    
 nsFileDlgResults  nsFileWidget::PutFile(
 	    nsIWidget        * aParent,
-	    nsString         & promptString,
+	    const nsString         & promptString,
 	    nsFileSpec       & theFileSpec)
 {
 	Create(aParent, promptString, eMode_save, nsnull, nsnull);

widget/src/mac/nsFileWidget.h

@@ -60,7 +60,7 @@ class nsFileWidget : public nsWindow, public nsIFileWidget
 
     // nsIFileWidget interface
 		NS_IMETHOD					   Create(nsIWidget *aParent,
-							                      nsString& aTitle,
+							                      const nsString& aTitle,
 							                      nsFileDlgMode aMode,
 							                      nsIDeviceContext *aContext = nsnull,
 							                      nsIAppShell *aAppShell = nsnull,
@@ -68,29 +68,28 @@ class nsFileWidget : public nsWindow, public nsIFileWidget
 							                      void *aInitData = nsnull);
 
     virtual PRBool      	Show();
-    NS_IMETHOD            GetFile(nsString& aFile);
     NS_IMETHOD            GetFile(nsFileSpec& aFile);
-    NS_IMETHOD            SetDefaultString(nsString& aString);
+    NS_IMETHOD            SetDefaultString(const nsString& aString);
     NS_IMETHOD           	SetFilterList(PRUint32 aNumberOfFilters,
                                           const nsString aTitles[],
                                           const nsString aFilters[]);
    
-    NS_IMETHOD            GetDisplayDirectory(nsString& aDirectory);
+    NS_IMETHOD            GetDisplayDirectory(nsFileSpec& aDirectory);
-    NS_IMETHOD            SetDisplayDirectory(nsString& aDirectory);
+    NS_IMETHOD            SetDisplayDirectory(const nsFileSpec& aDirectory);
 
 	  virtual nsFileDlgResults GetFile(
 	    nsIWidget        * aParent,
-	    nsString         & promptString,    // Window title for the dialog
+	    const nsString   & promptString,    // Window title for the dialog
 	    nsFileSpec       & theFileSpec);     // Populate with initial path for file dialog
 	    
 	  virtual nsFileDlgResults GetFolder(
 	    nsIWidget        * aParent,
-	    nsString         & promptString,    // Window title for the dialog
+	    const nsString   & promptString,    // Window title for the dialog
 	    nsFileSpec       & theFileSpec);     // Populate with initial path for file dialog 
 	    
 	  virtual nsFileDlgResults PutFile(
 	    nsIWidget        * aParent,
-	    nsString         & promptString,    // Window title for the dialog
+	    const nsString   & promptString,    // Window title for the dialog
 	    nsFileSpec       & theFileSpec);     // Populate with initial path for file dialog 
 
 
@@ -113,7 +112,7 @@ class nsFileWidget : public nsWindow, public nsIFileWidget
      const nsString*        mTitles;
      const nsString*        mFilters;
      nsString               mDefault;
-     nsString               mDisplayDirectory;
+     nsFileSpec             mDisplayDirectory;
      nsFileSpec				mFileSpec;
      nsFileDlgResults		mSelectResult;