Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed wxFileSelector() etc. functions to use wxString (so that any forms of strings can be used with it, not just wxChar*), while still preserving compatibility with passing NULL to them)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-04 09:53:17 +00:00
parent a862159daa
commit f8bcb37d99
2 changed files with 212 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
include/wx/filedlg.h
View File

@@ -148,41 +148,180 @@ private:
// wxFileDialog convenience functions
//----------------------------------------------------------------------------
// File selector - backward compatibility
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,
int flags = 0,
wxWindow *parent = NULL,
int x = wxDefaultCoord, int y = wxDefaultCoord);
// 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
// An extended version of wxFileSelector
WXDLLEXPORT wxString
wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr,
const wxChar *default_path = NULL,
const wxChar *default_filename = NULL,
int *indexDefaultExtension = 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);
// 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);
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<typename T>
inline wxString wxFileSelector(const wxString& message, const T& default_path)
{
return wxDoFileSelector(message, wxPtrOrStringToString(default_path));
}
template<typename T1, typename T2>
inline wxString wxFileSelector(const wxString& message,
const T1& default_path,
const T2& default_filename)
{
return wxDoFileSelector(message,
wxPtrOrStringToString(default_path),
wxPtrOrStringToString(default_filename));
}
template<typename T1, typename T2, typename T3>
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)
{
return wxDoFileSelector(message,
wxPtrOrStringToString(default_path),
wxPtrOrStringToString(default_filename),
wxPtrOrStringToString(default_extension),
wildcard,
flags,
parent,
x, y);
}
// An extended version of wxFileSelector
inline wxString wxFileSelectorEx()
{
return wxDoFileSelectorEx();
}
inline wxString wxFileSelectorEx(const wxString& message)
{
return wxDoFileSelectorEx(message);
}
template<typename T>
inline wxString wxFileSelectorEx(const wxString& message, const T& default_path)
{
return wxDoFileSelectorEx(message, wxPtrOrStringToString(default_path));
}
template<typename T1, typename T2>
inline wxString
wxFileSelectorEx(const wxString& message,
const T1& default_path,
const T2& default_filename,
int *indexDefaultExtension = NULL,
const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
int flags = 0,
wxWindow *parent = NULL,
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
template<typename T>
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<typename T>
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__)