X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd365871aadca528e03f3b6bb8382a1fdf5f1817..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/os2/filedlg.cpp?ds=sidebyside diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp index 24887d4bf5..d6d93809f3 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" @@ -38,6 +39,7 @@ #include #include "wx/tokenzr.h" +#include "wx/modalhook.h" #define wxMAXPATH 1024 #define wxMAXFILE 1024 @@ -92,8 +94,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++ ) { @@ -103,6 +105,8 @@ void wxFileDialog::GetPaths ( int wxFileDialog::ShowModal() { + WX_HOOK_MODAL_DIALOG(); + wxString sTheFilter; wxString sFilterBuffer; wxChar* pzFilterBuffer; @@ -152,21 +156,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; //