Changes for mingw32/gcc-2.95

[wxWidgets.git] / src / common / ffile.cpp

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 4e1aea21ecce0669d15c8a441479fc8fd558b9cb..e1e5a2dbe119a9111236a473034bf169784406aa 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -56,7 +56,21 @@ bool wxFFile::Open(const wxChar *filename, const char *mode)
 {
     wxASSERT_MSG( !m_fp, _T("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 )
     {
@@ -74,7 +88,7 @@ bool wxFFile::Close()
 {
     if ( IsOpened() )
     {
-        if ( !fclose(m_fp) )
+        if ( fclose(m_fp) != 0 )
         {
             wxLogSysError(_("can't close file '%s'"), m_name.c_str());
 
@@ -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());