bool wxFFile::Open(const wxChar *filename, const char *mode)
{
- wxASSERT_MSG( !m_fp, _T("should close or detach the old file first") );
+ wxASSERT_MSG( !m_fp, wxT("should close or detach the old file first") );
+#if wxUSE_UNICODE
+ char *tmp_fname;
+ size_t fname_len;
+
+ fname_len = wxStrlen(filename)+1;
+ tmp_fname = new char[fname_len];
+ wxWX2MB(tmp_fname, filename, fname_len);
+
+#if defined(__WXMAC__) && !defined(__UNIX__)
+ m_fp = fopen(wxUnix2MacFilename( tmp_fname ), mode);
+#else
+ m_fp = fopen(tmp_fname, mode);
+#endif
+
+ delete tmp_fname;
+#else
+#if defined(__WXMAC__) && !defined(__UNIX__)
+ m_fp = fopen(wxUnix2MacFilename( filename ), mode);
+#else
m_fp = fopen(filename, mode);
+#endif
+#endif
+
if ( !m_fp )
{
bool wxFFile::ReadAll(wxString *str)
{
- wxCHECK_MSG( str, FALSE, _T("invalid parameter") );
- wxCHECK_MSG( IsOpened(), FALSE, _T("can't read from closed file") );
+ wxCHECK_MSG( str, FALSE, wxT("invalid parameter") );
+ wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") );
clearerr(m_fp);
size_t wxFFile::Read(void *pBuf, size_t nCount)
{
- wxCHECK_MSG( pBuf, FALSE, _T("invalid parameter") );
- wxCHECK_MSG( IsOpened(), FALSE, _T("can't read from closed file") );
+ wxCHECK_MSG( pBuf, FALSE, wxT("invalid parameter") );
+ wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") );
size_t nRead = fread(pBuf, 1, nCount, m_fp);
if ( (nRead < nCount) && Error() )
size_t wxFFile::Write(const void *pBuf, size_t nCount)
{
- wxCHECK_MSG( pBuf, FALSE, _T("invalid parameter") );
- wxCHECK_MSG( IsOpened(), FALSE, _T("can't write to closed file") );
+ wxCHECK_MSG( pBuf, FALSE, wxT("invalid parameter") );
+ wxCHECK_MSG( IsOpened(), FALSE, wxT("can't write to closed file") );
size_t nWritten = fwrite(pBuf, 1, nCount, m_fp);
if ( nWritten < nCount )
{
if ( IsOpened() )
{
- if ( !fflush(m_fp) )
+ // fflush returns non-zero on error
+ //
+ if ( fflush(m_fp) )
{
wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
bool wxFFile::Seek(long ofs, wxSeekMode mode)
{
- wxCHECK_MSG( IsOpened(), FALSE, _T("can't seek on closed file") );
+ wxCHECK_MSG( IsOpened(), FALSE, wxT("can't seek on closed file") );
int origin;
switch ( mode )
{
default:
- wxFAIL_MSG(_T("unknown seek mode"));
+ wxFAIL_MSG(wxT("unknown seek mode"));
// still fall through
case wxFromStart: