X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/949c9f74c3ec1b3fba78079a5690034d1facfdb8..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/src/os2/filedlg.cpp?ds=sidebyside diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp index e8c7b524fa..77dcc5c30d 100644 --- a/src/os2/filedlg.cpp +++ b/src/os2/filedlg.cpp @@ -131,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) @@ -198,7 +193,7 @@ int wxFileDialog::ShowModal() else sTheFilter = m_wildCard; - wxStrtok((wxChar*)sTheFilter.c_str(), wxT("|"), &pzFilterBuffer); + wxStrtok(sTheFilter.wchar_str(), wxT("|"), &pzFilterBuffer); while(pzFilterBuffer != NULL) { if (nCount > 0 && !(nCount % 2))