X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c70014d966bbfa08d201ca24c825f2d88cc3975..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/ffile.h?ds=sidebyside

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index 2e19a906ec..6b63bded48 100644
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -60,7 +60,7 @@ public:
 
   // read/write (unbuffered)
     // read all data from the file into a string (useful for text files)
-  bool ReadAll(wxString *str);
+  bool ReadAll(wxString *str, wxMBConv& conv = wxConvUTF8);
     // returns number of bytes read - use Eof() and Error() to see if an error
     // occured or not
   size_t Read(void *pBuf, size_t nCount);
@@ -97,7 +97,7 @@ public:
     // get the file name
   const wxString& GetName() const { return m_name; }
     // type such as disk or pipe
-  wxFileTypeEnum GetFileType() const { return wxGetFileType(m_fp); }
+  wxFileKind GetKind() const { return wxGetFileKind(m_fp); }
 
   // dtor closes the file if opened
   ~wxFFile() { Close(); }