X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/556151f5ff1bd2fa44de2237a3ad03694c2e3883..ee5aa9d44fa75e88bce9981d7d02dea9f6d5f3c4:/src/os2/filedlg.cpp?ds=sidebyside diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp index 4a968e951a..06028d0a69 100644 --- a/src/os2/filedlg.cpp +++ b/src/os2/filedlg.cpp @@ -18,10 +18,11 @@ #if wxUSE_FILEDLG +#include "wx/filedlg.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/msgdlg.h" - #include "wx/filedlg.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/app.h" @@ -130,11 +131,6 @@ int wxFileDialog::ShowModal() else lFlags = FDS_OPEN_DIALOG; -#if WXWIN_COMPATIBILITY_2_4 - if (m_windowStyle & wxHIDE_READONLY) - lFlags |= FDS_SAVEAS_DIALOG; -#endif - if (m_windowStyle & wxFD_SAVE) lFlags |= FDS_SAVEAS_DIALOG; if (m_windowStyle & wxFD_MULTIPLE) @@ -197,7 +193,7 @@ int wxFileDialog::ShowModal() else sTheFilter = m_wildCard; - wxStrtok((wxChar*)sTheFilter.c_str(), wxT("|"), &pzFilterBuffer); + wxStrtok(sTheFilter.char_str(), wxT("|"), &pzFilterBuffer); while(pzFilterBuffer != NULL) { if (nCount > 0 && !(nCount % 2))