X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/daf3246330c8ae7b4536cd1f6deef733a405cecd..132422c4b93a0fe5d4f313350adf2c13423c07ac:/src/common/fldlgcmn.cpp diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp index 119665674f..fbdc429dbc 100644 --- a/src/common/fldlgcmn.cpp +++ b/src/common/fldlgcmn.cpp @@ -99,7 +99,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath, wxString fileName = filePath.AfterLast(wxFILE_SEP_PATH); // if fileName is of form "foo.bar" it's ok, return it - int idx_dot = fileName.Find(wxT('.'), TRUE); + int idx_dot = fileName.Find(wxT('.'), true); if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.Len() - 1)) return filePath; @@ -107,7 +107,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath, wxString ext = extensionList.BeforeFirst(wxT(';')); // if ext == "foo" or "foo." there's no extension - int idx_ext_dot = ext.Find(wxT('.'), TRUE); + int idx_ext_dot = ext.Find(wxT('.'), true); if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.Len() - 1)) return filePath; else @@ -116,7 +116,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath, // if ext == "*" or "bar*" or "b?r" or " " then its not valid if ((ext.Find(wxT('*')) != wxNOT_FOUND) || (ext.Find(wxT('?')) != wxNOT_FOUND) || - (ext.Strip(wxString::both).IsEmpty())) + (ext.Strip(wxString::both).empty())) return filePath; // if fileName doesn't have a '.' then add one @@ -214,10 +214,10 @@ wxString wxFileSelectorEx(const wxChar *title, { wxFileDialog fileDialog(parent, - title ? title : wxT(""), - defaultDir ? defaultDir : wxT(""), - defaultFileName ? defaultFileName : wxT(""), - filter ? filter : wxT(""), + title ? title : wxEmptyString, + defaultDir ? defaultDir : wxEmptyString, + defaultFileName ? defaultFileName : wxEmptyString, + filter ? filter : wxEmptyString, flags, wxPoint(x, y)); wxString filename; @@ -277,7 +277,7 @@ WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what, const wxChar *default_name, wxWindow *parent) { - return wxDefaultFileSelector(TRUE, what, extension, default_name, parent); + return wxDefaultFileSelector(true, what, extension, default_name, parent); } //---------------------------------------------------------------------------- @@ -289,7 +289,7 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what, const wxChar *default_name, wxWindow *parent) { - return wxDefaultFileSelector(FALSE, what, extension, default_name, parent); + return wxDefaultFileSelector(false, what, extension, default_name, parent); } #endif // wxUSE_FILEDLG