X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82ff64fdb75496ae57f61731feec1529780eb1c3..4aae00c69cf6e44c52e1a9e39f60c5d6a3498b02:/src/common/file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 1e6f0e41e1..605519d4f8 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -14,10 +14,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "file.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -103,20 +99,10 @@
     };
 #endif // W_OK
 
-// there is no distinction between text and binary files under Unix, so define
-// O_BINARY as 0 if the system headers don't do it already
-#if defined(__UNIX__) && !defined(O_BINARY)
-    #define   O_BINARY    (0)
-#endif  //__UNIX__
-
 #ifdef __SALFORDC__
     #include <unix.h>
 #endif
 
-#ifndef MAX_PATH
-    #define MAX_PATH 512
-#endif
-
 // some broken compilers don't have 3rd argument in open() and creat()
 #ifdef __SALFORDC__
     #define ACCESS(access)
@@ -136,6 +122,12 @@
 #include  "wx/file.h"
 #include  "wx/filefn.h"
 
+// there is no distinction between text and binary files under Unix, so define
+// O_BINARY as 0 if the system headers don't do it already
+#if defined(__UNIX__) && !defined(O_BINARY)
+    #define   O_BINARY    (0)
+#endif  //__UNIX__
+
 #ifdef __WXMSW__
     #include "wx/msw/mslu.h"
 #endif
@@ -144,6 +136,9 @@
     #include "wx/msw/private.h"
 #endif
 
+#ifndef MAX_PATH
+    #define MAX_PATH 512
+#endif
 
 // ============================================================================
 // implementation of wxFile
@@ -189,12 +184,12 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
 // ----------------------------------------------------------------------------
 
 // ctors
-wxFile::wxFile(const wxChar *szFileName, OpenMode mode)
+wxFile::wxFile(const wxString& fileName, OpenMode mode)
 {
     m_fd = fd_invalid;
     m_error = false;
 
-    Open(szFileName, mode);
+    Open(fileName, mode);
 }
 
 // create the file, fail if it already exists and bOverwrite
@@ -217,11 +212,9 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
         wxLogSysError(_("can't create file '%s'"), szFileName);
         return false;
     }
-    else
-    {
-        Attach(fd);
-        return true;
-    }
+
+    Attach(fd);
+    return true;
 }
 
 // open the file
@@ -271,10 +264,9 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
         wxLogSysError(_("can't open file '%s'"), szFileName);
         return false;
     }
-    else {
-        Attach(fd);
-        return true;
-    }
+
+    Attach(fd);
+    return true;
 }
 
 // close
@@ -331,20 +323,31 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
     return iRc;
 }
 
+bool wxFile::Write(const wxString& s, const wxMBConv& conv)
+{
+  const wxWX2MBbuf buf = s.mb_str(conv);
+  if ( !buf )
+      return false;
+
+  const size_t size = strlen(buf); // FIXME: use buf.length() when available
+  return Write(buf, size) == size;
+}
+
 // flush
 bool wxFile::Flush()
 {
-    if ( IsOpened() ) {
-#if defined(__VISUALC__) || HAVE_FSYNC
+#ifdef HAVE_FSYNC
+    // fsync() only works on disk files and returns errors for pipes, don't
+    // call it then
+    if ( IsOpened() && GetKind() == wxFILE_KIND_DISK )
+    {
         if ( wxFsync(m_fd) == -1 )
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
             return false;
         }
-#else // no fsync
-        // just do nothing
-#endif // fsync
     }
+#endif // HAVE_FSYNC
 
     return true;
 }