From: Václav Slavík Date: Sun, 8 Jul 2007 08:40:37 +0000 (+0000) Subject: fix Watcom compilation: removed templates for wxFileSelector() compatibility with... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6dc2e8233023023f7e3ced53be717bc61e9888ca fix Watcom compilation: removed templates for wxFileSelector() compatibility with passing NULL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index eebb5c93a6..a227f7163f 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -148,180 +148,41 @@ private: // wxFileDialog convenience functions //---------------------------------------------------------------------------- -// 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 -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, +WXDLLEXPORT wxString +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) -{ - return wxDoFileSelector(message, - wxPtrOrStringToString(default_path), - wxPtrOrStringToString(default_filename), - wxPtrOrStringToString(default_extension), - wildcard, - flags, - parent, - x, y); -} + int x = wxDefaultCoord, int y = wxDefaultCoord); // An extended version of wxFileSelector -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, +WXDLLEXPORT wxString +wxFileSelectorEx(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) -{ - return wxDoFileSelectorEx(message, - wxPtrOrStringToString(default_path), - wxPtrOrStringToString(default_filename), - indexDefaultExtension, - wildcard, - flags, - parent, - x, y); -} + int x = wxDefaultCoord, int y = wxDefaultCoord); // Ask for filename to load -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); -} +WXDLLEXPORT wxString +wxLoadFileSelector(const wxString& what, + const wxString& extension, + const wxString& default_name = wxEmptyString, + wxWindow *parent = NULL); // Ask for filename to save -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 +WXDLLEXPORT wxString +wxSaveFileSelector(const wxString& what, + const wxString& extension, + const wxString& default_name = wxEmptyString, + wxWindow *parent = NULL); #if defined (__WXUNIVERSAL__) diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp index d6528d8a99..71c0a977ce 100644 --- a/src/common/fldlgcmn.cpp +++ b/src/common/fldlgcmn.cpp @@ -153,14 +153,14 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath, // wxFileDialog convenience functions //---------------------------------------------------------------------------- -wxString wxDoFileSelector(const wxString& title, - const wxString& defaultDir, - const wxString& defaultFileName, - const wxString& defaultExtension, - const wxString& filter, - int flags, - wxWindow *parent, - int x, int y) +wxString wxFileSelector(const wxString& title, + const wxString& defaultDir, + const wxString& defaultFileName, + const wxString& defaultExtension, + const wxString& filter, + int flags, + wxWindow *parent, + int x, int y) { // The defaultExtension, if non-empty, is // appended to the filename if the user fails to type an extension. The new @@ -217,15 +217,15 @@ wxString wxDoFileSelector(const wxString& title, // wxFileSelectorEx //---------------------------------------------------------------------------- -wxString wxDoFileSelectorEx(const wxString& title, - const wxString& defaultDir, - const wxString& defaultFileName, - int* defaultFilterIndex, - const wxString& filter, - int flags, - wxWindow* parent, - int x, - int y) +wxString wxFileSelectorEx(const wxString& title, + const wxString& defaultDir, + const wxString& defaultFileName, + int* defaultFilterIndex, + const wxString& filter, + int flags, + wxWindow* parent, + int x, + int y) { wxFileDialog fileDialog(parent, @@ -289,10 +289,10 @@ static wxString wxDefaultFileSelector(bool load, // wxLoadFileSelector //---------------------------------------------------------------------------- -WXDLLEXPORT wxString wxDoLoadFileSelector(const wxString& what, - const wxString& extension, - const wxString& default_name, - wxWindow *parent) +WXDLLEXPORT wxString wxLoadFileSelector(const wxString& what, + const wxString& extension, + const wxString& default_name, + wxWindow *parent) { return wxDefaultFileSelector(true, what, extension, default_name, parent); } @@ -301,10 +301,10 @@ WXDLLEXPORT wxString wxDoLoadFileSelector(const wxString& what, // wxSaveFileSelector //---------------------------------------------------------------------------- -WXDLLEXPORT wxString wxDoSaveFileSelector(const wxString& what, - const wxString& extension, - const wxString& default_name, - wxWindow *parent) +WXDLLEXPORT wxString wxSaveFileSelector(const wxString& what, + const wxString& extension, + const wxString& default_name, + wxWindow *parent) { return wxDefaultFileSelector(false, what, extension, default_name, parent); }