X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45f4109c41d3b02d448559f33682be709f02bb61..d7640339e92492ee1ee32384f471cce0f9f169fa:/include/wx/filedlg.h diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 8a16ded262..eebb5c93a6 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -50,9 +50,6 @@ enum wxOPEN = wxFD_OPEN, wxSAVE = wxFD_SAVE, wxOVERWRITE_PROMPT = wxFD_OVERWRITE_PROMPT, -#if WXWIN_COMPATIBILITY_2_4 - wxHIDE_READONLY = 0x0008, -#endif wxFILE_MUST_EXIST = wxFD_FILE_MUST_EXIST, wxMULTIPLE = wxFD_MULTIPLE, wxCHANGE_DIR = wxFD_CHANGE_DIR @@ -118,16 +115,13 @@ public: // Utility functions -#if WXWIN_COMPATIBILITY_2_4 - // Parses the wildCard, returning the number of filters. - // Returns 0 if none or if there's a problem, - // The arrays will contain an equal number of items found before the error. - // wildCard is in the form: - // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png" - wxDEPRECATED( static int ParseWildcard(const wxString& wildCard, - wxArrayString& descriptions, - wxArrayString& filters) ); -#endif // WXWIN_COMPATIBILITY_2_4 +#if WXWIN_COMPATIBILITY_2_6 + + wxDEPRECATED( long GetStyle() const ); + wxDEPRECATED( void SetStyle(long style) ); + +#endif // WXWIN_COMPATIBILITY_2_6 + // Append first extension to filePath from a ';' separated extensionList // if filePath = "path/foo.bar" just return it as is @@ -154,41 +148,180 @@ private: // wxFileDialog convenience functions //---------------------------------------------------------------------------- -// File selector - backward compatibility +// NB: wxFileSelector() etc. used to take const wxChar* arguments in wx-2.8 +// and their default value was NULL. The official way to use these +// functions is to use wxString, with wxEmptyString as the default value. +// The templates below exist only to maintain compatibility with wx-2.8. + +#if WXWIN_COMPATIBILITY_2_8 +// return wxString created from the argument, return empty string if the +// argument is NULL: +inline wxString wxPtrOrStringToString(const wxString& s) { return s; } +inline wxString wxPtrOrStringToString(const char *s) { return s; } +inline wxString wxPtrOrStringToString(const wchar_t *s) { return s; } +inline wxString wxPtrOrStringToString(const wxCStrData& s) { return s; } +inline wxString wxPtrOrStringToString(const wxCharBuffer& s) { return s; } +inline wxString wxPtrOrStringToString(const wxWCharBuffer& s) { return s; } +// this one is for NULL: +inline wxString wxPtrOrStringToString(int s) +{ + wxASSERT_MSG( s == 0, _T("passing non-NULL int as string?") ); + return wxEmptyString; +} +#endif // WXWIN_COMPATIBILITY_2_8 + WXDLLEXPORT wxString -wxFileSelector(const wxChar *message = wxFileSelectorPromptStr, - const wxChar *default_path = NULL, - const wxChar *default_filename = NULL, - const wxChar *default_extension = NULL, - const wxChar *wildcard = wxFileSelectorDefaultWildcardStr, +wxDoFileSelector(const wxString& message = wxFileSelectorPromptStr, + const wxString& default_path = wxEmptyString, + const wxString& default_filename = wxEmptyString, + const wxString& default_extension = wxEmptyString, + const wxString& wildcard = wxFileSelectorDefaultWildcardStr, + int flags = 0, + wxWindow *parent = NULL, + int x = wxDefaultCoord, int y = wxDefaultCoord); + +WXDLLEXPORT wxString +wxDoFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, + const wxString& default_path = wxEmptyString, + const wxString& default_filename = wxEmptyString, + int *indexDefaultExtension = NULL, + const wxString& wildcard = wxFileSelectorDefaultWildcardStr, + int flags = 0, + wxWindow *parent = NULL, + int x = wxDefaultCoord, int y = wxDefaultCoord); + +WXDLLEXPORT wxString +wxDoLoadFileSelector(const wxString& what, + const wxString& extension, + const wxString& default_name = wxEmptyString, + wxWindow *parent = NULL); + +WXDLLEXPORT wxString +wxDoSaveFileSelector(const wxString& what, + const wxString& extension, + const wxString& default_name = wxEmptyString, + wxWindow *parent = NULL); + +#if WXWIN_COMPATIBILITY_2_8 + +// File selector - backward compatibility +inline wxString wxFileSelector() +{ + return wxDoFileSelector(); +} + +inline wxString wxFileSelector(const wxString& message) +{ + return wxDoFileSelector(message); +} + +template +inline wxString wxFileSelector(const wxString& message, const T& default_path) +{ + return wxDoFileSelector(message, wxPtrOrStringToString(default_path)); +} + +template +inline wxString wxFileSelector(const wxString& message, + const T1& default_path, + const T2& default_filename) +{ + return wxDoFileSelector(message, + wxPtrOrStringToString(default_path), + wxPtrOrStringToString(default_filename)); +} + +template +inline wxString +wxFileSelector(const wxString& message, + const T1& default_path, + const T2& default_filename, + const T3& default_extension, + const wxString& wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, wxWindow *parent = NULL, - int x = wxDefaultCoord, int y = wxDefaultCoord); + int x = wxDefaultCoord, int y = wxDefaultCoord) +{ + return wxDoFileSelector(message, + wxPtrOrStringToString(default_path), + wxPtrOrStringToString(default_filename), + wxPtrOrStringToString(default_extension), + wildcard, + flags, + parent, + x, y); +} // An extended version of wxFileSelector -WXDLLEXPORT wxString -wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr, - const wxChar *default_path = NULL, - const wxChar *default_filename = NULL, +inline wxString wxFileSelectorEx() +{ + return wxDoFileSelectorEx(); +} + +inline wxString wxFileSelectorEx(const wxString& message) +{ + return wxDoFileSelectorEx(message); +} + +template +inline wxString wxFileSelectorEx(const wxString& message, const T& default_path) +{ + return wxDoFileSelectorEx(message, wxPtrOrStringToString(default_path)); +} + +template +inline wxString +wxFileSelectorEx(const wxString& message, + const T1& default_path, + const T2& default_filename, int *indexDefaultExtension = NULL, - const wxChar *wildcard = wxFileSelectorDefaultWildcardStr, + const wxString& wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, wxWindow *parent = NULL, - int x = wxDefaultCoord, int y = wxDefaultCoord); + int x = wxDefaultCoord, int y = wxDefaultCoord) +{ + return wxDoFileSelectorEx(message, + wxPtrOrStringToString(default_path), + wxPtrOrStringToString(default_filename), + indexDefaultExtension, + wildcard, + flags, + parent, + x, y); +} // Ask for filename to load -WXDLLEXPORT wxString -wxLoadFileSelector(const wxChar *what, - const wxChar *extension, - const wxChar *default_name = (const wxChar *)NULL, - wxWindow *parent = (wxWindow *) NULL); +template +inline wxString wxLoadFileSelector(const wxString& what, + const wxString& extension, + const T& default_name = T(), + wxWindow *parent = NULL) +{ + return wxDoLoadFileSelector(what, extension, + wxPtrOrStringToString(default_name), + parent); +} // Ask for filename to save -WXDLLEXPORT wxString -wxSaveFileSelector(const wxChar *what, - const wxChar *extension, - const wxChar *default_name = (const wxChar *) NULL, - wxWindow *parent = (wxWindow *) NULL); +template +inline wxString wxSaveFileSelector(const wxString& what, + const wxString& extension, + const T& default_name = T(), + wxWindow *parent = NULL) +{ + return wxDoSaveFileSelector(what, extension, + wxPtrOrStringToString(default_name), + parent); +} + +#else // !WXWIN_COMPATIBILITY_2_8 + +#define wxFileSelector wxDoFileSelector +#define wxFileSelectorEx wxDoFileSelectorEx +#define wxLoadFileSelector wxDoLoadFileSelector +#define wxSaveFileSelector wxDoSaveFileSelector + +#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8 #if defined (__WXUNIVERSAL__)