X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d8eb95b3536b0702122fa65b02ad9c3feab87af..5d7792236f7e4fcbb94cdc2a5213e0c5788e8c28:/src/os2/filedlg.cpp?ds=sidebyside diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp index 77dcc5c30d..f4fc9da6f1 100644 --- a/src/os2/filedlg.cpp +++ b/src/os2/filedlg.cpp @@ -23,6 +23,7 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/msgdlg.h" + #include "wx/filename.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/app.h" @@ -92,8 +93,8 @@ void wxFileDialog::GetPaths ( size_t nCount = m_fileNames.GetCount(); rasPaths.Empty(); - if (m_dir.Last() != _T('\\')) - sDir += _T('\\'); + if (m_dir.Last() != wxT('\\')) + sDir += wxT('\\'); for ( size_t n = 0; n < nCount; n++ ) { @@ -152,21 +153,21 @@ int wxFileDialog::ShowModal() switch (ch) { - case _T('/'): + case wxT('/'): // // Convert to backslash // - ch = _T('\\'); + ch = wxT('\\'); // // Fall through // - case _T('\\'): + case wxT('\\'): while (i < nLen - 1) { wxChar chNext = m_dir[i + 1]; - if (chNext != _T('\\') && chNext != _T('/')) + if (chNext != wxT('\\') && chNext != wxT('/')) break; // @@ -248,11 +249,11 @@ int wxFileDialog::ShowModal() int nIdx = wxStrlen(zFileNameBuffer) - 1; wxString sExt; - wxSplitPath( zFileNameBuffer - ,&m_path - ,&m_fileName - ,&sExt - ); + wxFileName::SplitPath( zFileNameBuffer + ,&m_path + ,&m_fileName + ,&sExt + ); if (zFileNameBuffer[nIdx] == wxT('.') || sExt.empty()) { zFileNameBuffer[nIdx] = wxT('\0');