X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2e1ef1928b7a2a292a6a5b9bd6fa2402a0c6b0f..124193837f27d1fb75b9607f0e005b9897d1e320:/src/common/ffile.cpp?ds=sidebyside

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index f880a43134..3e405491ee 100644
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -28,7 +28,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_FILE
+#if wxUSE_FFILE
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
@@ -54,9 +54,23 @@ wxFFile::wxFFile(const wxChar *filename, const char *mode)
 
 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);
+
+    m_fp = fopen(tmp_fname, mode);
+
+    delete tmp_fname;
+#else
     m_fp = fopen(filename, mode);
+#endif
+
 
     if ( !m_fp )
     {
@@ -93,8 +107,8 @@ bool wxFFile::Close()
 
 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);
 
@@ -123,8 +137,8 @@ bool wxFFile::ReadAll(wxString *str)
 
 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() )
@@ -137,8 +151,8 @@ size_t wxFFile::Read(void *pBuf, size_t nCount)
 
 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 )
@@ -153,7 +167,9 @@ bool wxFFile::Flush()
 {
     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());
 
@@ -170,13 +186,13 @@ bool wxFFile::Flush()
 
 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:
@@ -234,4 +250,4 @@ size_t wxFFile::Length() const
     return (size_t)-1;
 }
 
-#endif // wxUSE_FILE
+#endif // wxUSE_FFILE