we need our own imaglist implementation because in wxmac wxIcon does not inherit...

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

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index 2e19a906ecaaab68a191e1904b12febe7522daac..6b63bded48a9857d956e2917ff67591eec57358f 100644 (file)
--- 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)
 
   // 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);
     // 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
     // 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(); }
 
   // dtor closes the file if opened
   ~wxFFile() { Close(); }