Added 32-bit (UCS-4) wxUString class

[wxWidgets.git] / src / os2 / filedlg.cpp

diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp
index e8c7b524fa6eb5043164d3844bdf207ae0ef841e..77dcc5c30db45f9ab1a2b0e76ed14ee6f7629272 100644 (file)
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -131,11 +131,6 @@ int wxFileDialog::ShowModal()
     else
         lFlags = FDS_OPEN_DIALOG;
 
     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)
     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;
 
     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))
     while(pzFilterBuffer != NULL)
     {
         if (nCount > 0 && !(nCount % 2))