X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e031f1df56a1595c7ebb4027eb89bf1c9f286bdf..68ca12fef650ce4622e05ba4eb21a7aa23849107:/src/os2/filedlg.cpp diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp index 5f14190ee6..77dcc5c30d 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" @@ -78,8 +79,7 @@ wxFileDialog::wxFileDialog ( :wxFileDialogBase(pParent, rsMessage, rsDefaultDir, rsDefaultFileName, rsWildCard, lStyle, rPos, sz, name) { - if ((m_windowStyle & wxFD_MULTIPLE) && (m_windowStyle & wxFD_SAVE)) - m_windowStyle &= ~wxFD_MULTIPLE; + // NB: all style checks are done by wxFileDialogBase::Create m_filterIndex = 1; } // end of wxFileDialog::wxFileDialog @@ -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))