#include "wx/intl.h"
#include "wx/log.h"
#include "wx/app.h"
+ #include "wx/math.h"
#endif
#define INCL_PM
#include "wx/os2/private.h"
-#include <math.h>
#include <stdlib.h>
#include <string.h>
else
lFlags = FDS_OPEN_DIALOG;
- if ((m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE))
+#if WXWIN_COMPATIBILITY_2_4
+ if (m_dialogStyle & wxHIDE_READONLY)
+ lFlags |= FDS_SAVEAS_DIALOG;
+#endif
+
+ if (m_dialogStyle & wxSAVE)
lFlags |= FDS_SAVEAS_DIALOG;
if (m_dialogStyle & wxMULTIPLE )
lFlags |= FDS_OPEN_DIALOG | FDS_MULTIPLESEL;
vFileDlg.cbSize = sizeof(FILEDLG);
vFileDlg.fl = lFlags;
- vFileDlg.pszTitle = zTitleBuffer;
+ vFileDlg.pszTitle = (PSZ)zTitleBuffer;
//
// Convert forward slashes to backslashes (file selector doesn't like
}
}
if ( wxStrlen(m_wildCard) == 0 )
- sTheFilter = "";
+ sTheFilter = wxEmptyString;
else
sTheFilter = m_wildCard;
- pzFilterBuffer = strtok((char*)sTheFilter.c_str(), "|");
+ wxStrtok((wxChar*)sTheFilter.c_str(), wxT("|"), &pzFilterBuffer);
while(pzFilterBuffer != NULL)
{
if (nCount > 0 && !(nCount % 2))
{
sDir += pzFilterBuffer;
}
- pzFilterBuffer = strtok(NULL, "|");
+ wxStrtok(NULL, wxT("|"), &pzFilterBuffer);
nCount++;
}
if (nCount == 0)
sDir += m_fileName;
if (sDir.IsEmpty())
- sDir = "*.*";
- wxStrcpy(vFileDlg.szFullFile, sDir.c_str());
+ sDir = wxT("*.*");
+ wxStrcpy((wxChar*)vFileDlg.szFullFile, sDir);
sFilterBuffer = sDir;
hWnd = ::WinFileDlg( HWND_DESKTOP
m_fileNames.Empty();
if ((m_dialogStyle & wxMULTIPLE ) && vFileDlg.ulFQFCount > 1)
{
- for (int i = 0; i < vFileDlg.ulFQFCount; i++)
+ for (int i = 0; i < (int)vFileDlg.ulFQFCount; i++)
{
if (i == 0)
{
- m_dir = wxPathOnly(wxString((const char*)*vFileDlg.papszFQFilename[0]));
- m_path = (const char*)*vFileDlg.papszFQFilename[0];
+ m_dir = wxPathOnly(wxString((const wxChar*)*vFileDlg.papszFQFilename[0]));
+ m_path = (const wxChar*)*vFileDlg.papszFQFilename[0];
}
- m_fileName = wxFileNameFromPath(wxString((const char*)*vFileDlg.papszFQFilename[i]));
+ m_fileName = wxFileNameFromPath(wxString((const wxChar*)*vFileDlg.papszFQFilename[i]));
m_fileNames.Add(m_fileName);
}
::WinFreeFileDlgList(vFileDlg.papszFQFilename);
}
else if (!(m_dialogStyle & wxSAVE))
{
- m_path = vFileDlg.szFullFile;
- m_fileName = wxFileNameFromPath(vFileDlg.szFullFile);
- m_dir = wxPathOnly(vFileDlg.szFullFile);
+ m_path = (wxChar*)vFileDlg.szFullFile;
+ m_fileName = wxFileNameFromPath(wxString((const wxChar*)vFileDlg.szFullFile));
+ m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile);
}
else // save file
{
const wxChar* pzExtension = NULL;
- wxStrcpy(zFileNameBuffer, vFileDlg.szFullFile);
+ wxStrcpy(zFileNameBuffer, (const wxChar*)vFileDlg.szFullFile);
int nIdx = wxStrlen(zFileNameBuffer) - 1;
wxString sExt;
//
pzExtension = sFilterBuffer.c_str();
- for( int i = 0; i < sFilterBuffer.length(); i++ )
+ for( int i = 0; i < (int)sFilterBuffer.length(); i++ )
{
//
// Get extension
}
else
{
- m_path = vFileDlg.szFullFile;
+ m_path = (wxChar*)vFileDlg.szFullFile;
}
- m_fileName = wxFileNameFromPath(vFileDlg.szFullFile);
- m_dir = wxPathOnly(vFileDlg.szFullFile);
+ m_fileName = wxFileNameFromPath((const wxChar*)vFileDlg.szFullFile);
+ m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile);
//
// === Simulating the wxOVERWRITE_PROMPT >>============================