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

fix Watcom compilation: removed templates for wxFileSelector() compatibility with passing NULL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-07-08 08:40:37 +00:00
parent c5cf866314
commit 6dc2e82330
2 changed files with 49 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
include/wx/filedlg.h
View File

@@ -148,180 +148,41 @@ private:
// wxFileDialog convenience functions // wxFileDialog convenience functions
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// NB: wxFileSelector() etc. used to take const wxChar* arguments in wx-2.8 // File selector - backward compatibility
// 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 WXDLLEXPORT wxString
wxDoFileSelector(const wxString& message = wxFileSelectorPromptStr, wxFileSelector(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);
// An extended version of wxFileSelector
WXDLLEXPORT wxString
wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
const wxString& default_path = wxEmptyString, const wxString& default_path = wxEmptyString,
const wxString& default_filename = wxEmptyString, const wxString& default_filename = wxEmptyString,
const wxString& default_extension = wxEmptyString, int *indexDefaultExtension = NULL,
const wxString& wildcard = wxFileSelectorDefaultWildcardStr, const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
int flags = 0, int flags = 0,
wxWindow *parent = NULL, wxWindow *parent = NULL,
int x = wxDefaultCoord, int y = wxDefaultCoord); 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<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 // Ask for filename to load
template<typename T> WXDLLEXPORT wxString
inline wxString wxLoadFileSelector(const wxString& what, wxLoadFileSelector(const wxString& what,
const wxString& extension, const wxString& extension,
const T& default_name = T(), const wxString& default_name = wxEmptyString,
wxWindow *parent = NULL) wxWindow *parent = NULL);
{
return wxDoLoadFileSelector(what, extension,
wxPtrOrStringToString(default_name),
parent);
}
// Ask for filename to save // Ask for filename to save
template<typename T> WXDLLEXPORT wxString
inline wxString wxSaveFileSelector(const wxString& what, wxSaveFileSelector(const wxString& what,
const wxString& extension, const wxString& extension,
const T& default_name = T(), const wxString& default_name = wxEmptyString,
wxWindow *parent = NULL) 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__) #if defined (__WXUNIVERSAL__)

50
src/common/fldlgcmn.cpp
View File

@@ -153,14 +153,14 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
// wxFileDialog convenience functions // wxFileDialog convenience functions
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
wxString wxDoFileSelector(const wxString& title, wxString wxFileSelector(const wxString& title,
const wxString& defaultDir, const wxString& defaultDir,
const wxString& defaultFileName, const wxString& defaultFileName,
const wxString& defaultExtension, const wxString& defaultExtension,
const wxString& filter, const wxString& filter,
int flags, int flags,
wxWindow *parent, wxWindow *parent,
int x, int y) int x, int y)
{ {
// The defaultExtension, if non-empty, is // The defaultExtension, if non-empty, is
// appended to the filename if the user fails to type an extension. The new // appended to the filename if the user fails to type an extension. The new
@@ -217,15 +217,15 @@ wxString wxDoFileSelector(const wxString& title,
// wxFileSelectorEx // wxFileSelectorEx
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
wxString wxDoFileSelectorEx(const wxString& title, wxString wxFileSelectorEx(const wxString& title,
const wxString& defaultDir, const wxString& defaultDir,
const wxString& defaultFileName, const wxString& defaultFileName,
int* defaultFilterIndex, int* defaultFilterIndex,
const wxString& filter, const wxString& filter,
int flags, int flags,
wxWindow* parent, wxWindow* parent,
int x, int x,
int y) int y)
{ {
wxFileDialog fileDialog(parent, wxFileDialog fileDialog(parent,
@@ -289,10 +289,10 @@ static wxString wxDefaultFileSelector(bool load,
// wxLoadFileSelector // wxLoadFileSelector
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
WXDLLEXPORT wxString wxDoLoadFileSelector(const wxString& what, WXDLLEXPORT wxString wxLoadFileSelector(const wxString& what,
const wxString& extension, const wxString& extension,
const wxString& default_name, const wxString& default_name,
wxWindow *parent) wxWindow *parent)
{ {
return wxDefaultFileSelector(true, what, extension, default_name, parent); return wxDefaultFileSelector(true, what, extension, default_name, parent);
} }
@@ -301,10 +301,10 @@ WXDLLEXPORT wxString wxDoLoadFileSelector(const wxString& what,
// wxSaveFileSelector // wxSaveFileSelector
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
WXDLLEXPORT wxString wxDoSaveFileSelector(const wxString& what, WXDLLEXPORT wxString wxSaveFileSelector(const wxString& what,
const wxString& extension, const wxString& extension,
const wxString& default_name, const wxString& default_name,
wxWindow *parent) wxWindow *parent)
{ {
return wxDefaultFileSelector(false, what, extension, default_name, parent); return wxDefaultFileSelector(false, what, extension, default_name, parent);
} }