зеркало из https://github.com/mozilla/gecko-dev.git
update to the new apis
This commit is contained in:
Родитель
2c6c16e5e5
Коммит
266cd2069e
|
@ -378,13 +378,8 @@ nsFilePicker::PutLocalFile(Str255 & inTitle, Str255 & inDefaultName, FSSpec* out
|
||||||
//
|
//
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
NS_IMETHODIMP nsFilePicker::SetFilterList(PRUint32 aNumberOfFilters,
|
NS_IMETHODIMP nsFilePicker::SetFilters(PRUint32 filterMask)
|
||||||
const PRUnichar **aTitles,
|
|
||||||
const PRUnichar **aFilters)
|
|
||||||
{
|
{
|
||||||
mNumberOfFilters = aNumberOfFilters;
|
|
||||||
mTitles = aTitles;
|
|
||||||
mFilters = aFilters;
|
|
||||||
|
|
||||||
#if USE_IC // FOR NOW JUST BYPASS ALL THIS CODE
|
#if USE_IC // FOR NOW JUST BYPASS ALL THIS CODE
|
||||||
|
|
||||||
|
@ -490,6 +485,13 @@ bail_wo_IC:
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NS_IMETHODIMP nsFilePicker::AppendFilter(const PRUnichar *aTitle,
|
||||||
|
const PRUnichar *aFilters)
|
||||||
|
{
|
||||||
|
return NS_ERROR_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
NS_IMETHODIMP nsFilePicker::GetFile(nsILocalFile **aFile)
|
NS_IMETHODIMP nsFilePicker::GetFile(nsILocalFile **aFile)
|
||||||
{
|
{
|
||||||
NS_ENSURE_ARG_POINTER(*aFile);
|
NS_ENSURE_ARG_POINTER(*aFile);
|
||||||
|
@ -497,16 +499,6 @@ NS_IMETHODIMP nsFilePicker::GetFile(nsILocalFile **aFile)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
//-------------------------------------------------------------------------
|
|
||||||
NS_IMETHODIMP nsFilePicker::GetSelectedFilter(PRInt32 *aType)
|
|
||||||
{
|
|
||||||
NS_ENSURE_ARG_POINTER(aType);
|
|
||||||
*aType = mSelectedType;
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
//
|
//
|
||||||
// Get the file + path
|
// Get the file + path
|
||||||
|
@ -546,17 +538,17 @@ NS_IMETHODIMP nsFilePicker::GetDisplayDirectory(nsILocalFile **aDirectory)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP nsFilePicker::Create(nsIDOMWindow *aParent,
|
NS_IMETHODIMP nsFilePicker::Init(nsIDOMWindow *aParent,
|
||||||
const PRUnichar *aTitle,
|
const PRUnichar *aTitle,
|
||||||
PRInt16 aMode)
|
PRInt16 aMode)
|
||||||
{
|
{
|
||||||
return nsBaseFilePicker::Create(aParent, aTitle, aMode);
|
return nsBaseFilePicker::Init(aParent, aTitle, aMode);
|
||||||
}
|
}
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
NS_IMETHODIMP nsFilePicker::CreateNative(nsIWidget *aParent,
|
NS_IMETHODIMP nsFilePicker::InitNative(nsIWidget *aParent,
|
||||||
const PRUnichar *aTitle,
|
const PRUnichar *aTitle,
|
||||||
PRInt16 aMode)
|
PRInt16 aMode)
|
||||||
{
|
{
|
||||||
|
|
||||||
mTitle = aTitle;
|
mTitle = aTitle;
|
||||||
|
|
|
@ -46,9 +46,9 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/* method from nsBaseFilePicker */
|
/* method from nsBaseFilePicker */
|
||||||
NS_IMETHOD CreateNative(nsIWidget *aParent,
|
NS_IMETHOD InitNative(nsIWidget *aParent,
|
||||||
const PRUnichar *aTitle,
|
const PRUnichar *aTitle,
|
||||||
PRInt16 aMode);
|
PRInt16 aMode);
|
||||||
|
|
||||||
|
|
||||||
NS_IMETHOD OnOk();
|
NS_IMETHOD OnOk();
|
||||||
|
@ -73,8 +73,8 @@ protected:
|
||||||
|
|
||||||
void GetFilterListArray(nsString& aFilterList);
|
void GetFilterListArray(nsString& aFilterList);
|
||||||
|
|
||||||
NavTypeListPtr mTypeLists[kMaxTypeListCount];
|
NavTypeListPtr mTypeLists[kMaxTypeListCount];
|
||||||
PRInt16 mSelectedType;
|
PRInt16 mSelectedType;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче