summaryrefslogtreecommitdiffstats
path: root/widget/windows/nsFilePicker.h
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-18 13:56:18 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-18 14:56:31 +0100
commita24398e42d2f300b5979d1fb45a481e2912fd4f3 (patch)
tree82c15ba37726971108f6b92c15a70e9f57950846 /widget/windows/nsFilePicker.h
parentb55f0e7f0d3c66b609ac8979265c62bd1fa85bb6 (diff)
downloadUXP-a24398e42d2f300b5979d1fb45a481e2912fd4f3.tar
UXP-a24398e42d2f300b5979d1fb45a481e2912fd4f3.tar.gz
UXP-a24398e42d2f300b5979d1fb45a481e2912fd4f3.tar.lz
UXP-a24398e42d2f300b5979d1fb45a481e2912fd4f3.tar.xz
UXP-a24398e42d2f300b5979d1fb45a481e2912fd4f3.zip
Remove unnecessary code in /widget.
- Remove numerous blocklist entries that no longer apply. - Remove CanComputeVirtualKeyCodeFromScanCode(), because it's always true. - Remove ShowXP{Folder,File}Picker(), since we have native pickers on supported Windows versions. - Remove the config.trim_on_minimize preference, which is pointless on NT6+ and will just cause problems if used. Tag #22.
Diffstat (limited to 'widget/windows/nsFilePicker.h')
-rw-r--r--widget/windows/nsFilePicker.h19
1 files changed, 3 insertions, 16 deletions
diff --git a/widget/windows/nsFilePicker.h b/widget/windows/nsFilePicker.h
index 90d8c15bc..3d692b3d4 100644
--- a/widget/windows/nsFilePicker.h
+++ b/widget/windows/nsFilePicker.h
@@ -87,32 +87,19 @@ public:
HRESULT STDMETHODCALLTYPE OnOverwrite(IFileDialog *pfd, IShellItem *psi, FDE_OVERWRITE_RESPONSE *pResponse);
protected:
- enum PickerType {
- PICKER_TYPE_OPEN,
- PICKER_TYPE_SAVE,
- };
-
/* method from nsBaseFilePicker */
virtual void InitNative(nsIWidget *aParent,
const nsAString& aTitle);
- static void GetQualifiedPath(const wchar_t *aInPath, nsString &aOutPath);
void GetFilterListArray(nsString& aFilterList);
- static bool GetFileNameWrapper(OPENFILENAMEW* ofn, PickerType aType);
- bool FilePickerWrapper(OPENFILENAMEW* ofn, PickerType aType);
- bool ShowXPFolderPicker(const nsString& aInitialDir);
- bool ShowXPFilePicker(const nsString& aInitialDir);
- bool ShowFolderPicker(const nsString& aInitialDir, bool &aWasInitError);
- bool ShowFilePicker(const nsString& aInitialDir, bool &aWasInitError);
- void AppendXPFilter(const nsAString& aTitle, const nsAString& aFilter);
+ bool ShowFolderPicker(const nsString& aInitialDir);
+ bool ShowFilePicker(const nsString& aInitialDir);
void RememberLastUsedDirectory();
bool IsPrivacyModeEnabled();
bool IsDefaultPathLink();
bool IsDefaultPathHtml();
void SetDialogHandle(HWND aWnd);
- bool ClosePickerIfNeeded(bool aIsXPDialog);
+ bool ClosePickerIfNeeded();
static void PickerCallbackTimerFunc(nsITimer *aTimer, void *aPicker);
- static UINT_PTR CALLBACK MultiFilePickerHook(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
- static UINT_PTR CALLBACK FilePickerHook(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
nsCOMPtr<nsILoadContext> mLoadContext;
nsCOMPtr<nsIWidget> mParentWidget;