From 266cd2069e540d31f957a5d19991cb25f646ab5f Mon Sep 17 00:00:00 2001
From: "pavlov%netscape.com" <pavlov%netscape.com>
Date: Fri, 24 Mar 2000 03:15:33 +0000
Subject: [PATCH] update to the new apis

---
 widget/src/mac/nsFilePicker.cpp | 38 +++++++++++++--------------------
 widget/src/mac/nsFilePicker.h   | 10 ++++-----
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/widget/src/mac/nsFilePicker.cpp b/widget/src/mac/nsFilePicker.cpp
index eb3ecb022b4b..c00159aa9241 100644
--- a/widget/src/mac/nsFilePicker.cpp
+++ b/widget/src/mac/nsFilePicker.cpp
@@ -378,13 +378,8 @@ nsFilePicker::PutLocalFile(Str255 & inTitle, Str255 & inDefaultName, FSSpec* out
 //
 //-------------------------------------------------------------------------
 
-NS_IMETHODIMP nsFilePicker::SetFilterList(PRUint32 aNumberOfFilters,
-                                          const PRUnichar **aTitles,
-                                          const PRUnichar **aFilters)
+NS_IMETHODIMP nsFilePicker::SetFilters(PRUint32 filterMask)
 {
-	mNumberOfFilters  = aNumberOfFilters;
-	mTitles           = aTitles;
-	mFilters          = aFilters;
 	
 #if USE_IC  // FOR NOW JUST BYPASS ALL THIS CODE
 
@@ -490,6 +485,13 @@ bail_wo_IC:
   return NS_OK;
 }
 
+NS_IMETHODIMP nsFilePicker::AppendFilter(const PRUnichar *aTitle,
+                                         const PRUnichar *aFilters)
+{
+  return NS_ERROR_FAILURE;
+}
+
+
 NS_IMETHODIMP nsFilePicker::GetFile(nsILocalFile **aFile)
 {
   NS_ENSURE_ARG_POINTER(*aFile);
@@ -497,16 +499,6 @@ NS_IMETHODIMP nsFilePicker::GetFile(nsILocalFile **aFile)
   return NS_OK;
 }
 
-
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::GetSelectedFilter(PRInt32 *aType)
-{
-  NS_ENSURE_ARG_POINTER(aType);
-  *aType = mSelectedType;
-  return NS_OK;
-}
-
 //-------------------------------------------------------------------------
 //
 // Get the file + path
@@ -546,17 +538,17 @@ NS_IMETHODIMP nsFilePicker::GetDisplayDirectory(nsILocalFile **aDirectory)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsFilePicker::Create(nsIDOMWindow *aParent,
-                                   const PRUnichar *aTitle,
-                                   PRInt16 aMode)
+NS_IMETHODIMP nsFilePicker::Init(nsIDOMWindow *aParent,
+                                 const PRUnichar *aTitle,
+                                 PRInt16 aMode)
 {
-  return nsBaseFilePicker::Create(aParent, aTitle, aMode);
+  return nsBaseFilePicker::Init(aParent, aTitle, aMode);
 }
 
 //-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::CreateNative(nsIWidget *aParent,
-                                         const PRUnichar *aTitle,
-                                         PRInt16 aMode)
+NS_IMETHODIMP nsFilePicker::InitNative(nsIWidget *aParent,
+                                       const PRUnichar *aTitle,
+                                       PRInt16 aMode)
 {
 
   mTitle = aTitle;
diff --git a/widget/src/mac/nsFilePicker.h b/widget/src/mac/nsFilePicker.h
index 71bb376f3657..5c1c2052d99a 100644
--- a/widget/src/mac/nsFilePicker.h
+++ b/widget/src/mac/nsFilePicker.h
@@ -46,9 +46,9 @@ public:
 
 protected:
   /* method from nsBaseFilePicker */
-  NS_IMETHOD CreateNative(nsIWidget *aParent,
-                          const PRUnichar *aTitle,
-                          PRInt16 aMode);
+  NS_IMETHOD InitNative(nsIWidget *aParent,
+                        const PRUnichar *aTitle,
+                        PRInt16 aMode);
 
 
   NS_IMETHOD            OnOk();
@@ -73,8 +73,8 @@ protected:
   
   void GetFilterListArray(nsString& aFilterList);
   
-  NavTypeListPtr			mTypeLists[kMaxTypeListCount];
-  PRInt16				mSelectedType;
+  NavTypeListPtr         mTypeLists[kMaxTypeListCount];
+  PRInt16				 mSelectedType;
 
 };