X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20ceebaa878e9fb54e678c6498aeaeeaae9f0590..c59abe0376cf9d488b8ea1ae49fa2858c4057cc5:/include/wx/ffile.h diff --git a/include/wx/ffile.h b/include/wx/ffile.h index c254ed04ed..58aca44eaf 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 @@ -54,14 +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) + bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto()) { const wxWX2MBbuf buf = s.mb_str(conv); size_t size = strlen(buf);