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 69d1c04af8d5db3718a2135dc0072ba1f91caba4..e1e5a2dbe119a9111236a473034bf169784406aa 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -31,6 +31,8 @@
 #if wxUSE_FILE
 
 #ifndef WX_PRECOMP
 #if wxUSE_FILE
 
 #ifndef WX_PRECOMP

+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/ffile.h"
 #endif
 
 #include "wx/ffile.h"


@@ -54,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") );
 
 {
     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);
     m_fp = fopen(filename, mode);

+#endif
+

 
     if ( !m_fp )
     {
 
     if ( !m_fp )
     {


@@ -72,7 +88,7 @@ bool wxFFile::Close()
 {
     if ( IsOpened() )
     {
 {
     if ( IsOpened() )
     {

-        if ( !fclose(m_fp) )
+        if ( fclose(m_fp) != 0 )

         {
             wxLogSysError(_("can't close file '%s'"), m_name.c_str());
 
         {
             wxLogSysError(_("can't close file '%s'"), m_name.c_str());
 


@@ -151,7 +167,9 @@ bool wxFFile::Flush()
 {
     if ( IsOpened() )
     {
 {
     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());
 
         {
             wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());