don't access the window after it had been deleted by the focus event handler (patch...

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 7c494b4d714e4a098df9092890ef3d81adecbe72..605519d4f8fe265b12ae5e14c5f63d9ff073e15f 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -99,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)
@@ -132,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
@@ -140,6 +136,9 @@
     #include "wx/msw/private.h"
 #endif
 
+#ifndef MAX_PATH
+    #define MAX_PATH 512
+#endif
 
 // ============================================================================
 // implementation of wxFile
@@ -185,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
@@ -324,6 +323,16 @@ 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()
 {