Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / file.h

diff --git a/include/wx/file.h b/include/wx/file.h
index 5b04b0d7a25aa447a44d1ca2fa6fdb8592ba1155..b2cd59eab09b95a9a636d7eb730bd0c415795661 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        file.h
+// Name:        wx/file.h

 // Purpose:     wxFile - encapsulates low-level "file descriptor"
 //              wxTempFile - safely replace the old file
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
 // Purpose:     wxFile - encapsulates low-level "file descriptor"
 //              wxTempFile - safely replace the old file
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -19,7 +18,7 @@
 
 #include  "wx/string.h"
 #include  "wx/filefn.h"
 
 #include  "wx/string.h"
 #include  "wx/filefn.h"

-#include  "wx/strconv.h"
+#include  "wx/convauto.h"

 
 // ----------------------------------------------------------------------------
 // class wxFile: raw file IO
 
 // ----------------------------------------------------------------------------
 // class wxFile: raw file IO


@@ -70,12 +69,14 @@ public:
   int  fd() const { return m_fd; }
 
   // read/write (unbuffered)
   int  fd() const { return m_fd; }
 
   // read/write (unbuffered)

+    // read all data from the file into a string (useful for text files)
+  bool ReadAll(wxString *str, const wxMBConv& conv = wxConvAuto());

     // returns number of bytes read or wxInvalidOffset on error
   ssize_t Read(void *pBuf, size_t nCount);
     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success
     // returns number of bytes read or wxInvalidOffset on error
   ssize_t Read(void *pBuf, size_t nCount);
     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success

-  bool Write(const wxString& s, const wxMBConv& conv = wxMBConvUTF8());
+  bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto());

     // flush data not yet written
   bool Flush();
 
     // flush data not yet written
   bool Flush();