X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20ceebaa878e9fb54e678c6498aeaeeaae9f0590..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/ffile.h?ds=inline diff --git a/include/wx/ffile.h b/include/wx/ffile.h index c254ed04ed..861f496547 100644 --- a/include/wx/ffile.h +++ b/include/wx/ffile.h @@ -18,6 +18,7 @@ #include "wx/string.h" #include "wx/filefn.h" +#include "wx/convauto.h" #include @@ -36,13 +37,13 @@ public: // def ctor wxFFile() { m_fp = NULL; } // open specified file (may fail, use IsOpened()) - wxFFile(const wxChar *filename, const wxChar *mode = _T("r")); + wxFFile(const wxString& filename, const wxString& mode = wxT("r")); // attach to (already opened) file wxFFile(FILE *lfp) { m_fp = lfp; } // open/close // open a file (existing or not - the mode controls what happens) - bool Open(const wxChar *filename, const wxChar *mode = _T("r")); + bool Open(const wxString& filename, const wxString& mode = wxT("r")); // closes the opened file (this is a NOP if not opened) bool Close(); @@ -54,19 +55,14 @@ public: // read/write (unbuffered) // read all data from the file into a string (useful for text files) - bool ReadAll(wxString *str, wxMBConv& conv = wxConvUTF8); + bool ReadAll(wxString *str, const wxMBConv& conv = wxConvAuto()); // returns number of bytes read - use Eof() and Error() to see if an error // occurred or not size_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, wxMBConv& conv = wxConvUTF8) - { - const wxWX2MBbuf buf = s.mb_str(conv); - size_t size = strlen(buf); - return Write((const char *)buf, size) == size; - } + bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto()); // flush data not yet written bool Flush();