X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3103e8a97e834e9793f0eb149aa82a99fd64ef9a..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/ffile.h?ds=inline diff --git a/include/wx/ffile.h b/include/wx/ffile.h index b9450458f5..15984f7b11 100644 --- a/include/wx/ffile.h +++ b/include/wx/ffile.h @@ -12,18 +12,13 @@ #ifndef _WX_FFILE_H_ #define _WX_FFILE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "ffile.h" -#endif - #include "wx/defs.h" // for wxUSE_FFILE #if wxUSE_FFILE -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/filefn.h" -#endif +#include "wx/string.h" +#include "wx/filefn.h" +#include "wx/convauto.h" #include @@ -44,7 +39,7 @@ public: // open specified file (may fail, use IsOpened()) wxFFile(const wxChar *filename, const wxChar *mode = _T("r")); // attach to (already opened) file - wxFFile(FILE *fp) { m_fp = fp; } + wxFFile(FILE *lfp) { m_fp = lfp; } // open/close // open a file (existing or not - the mode controls what happens) @@ -53,26 +48,21 @@ public: bool Close(); // assign an existing file descriptor and get it back from wxFFile object - void Attach(FILE *fp, const wxString& name = wxEmptyString) - { Close(); m_fp = fp; m_name = name; } + void Attach(FILE *lfp, const wxString& name = wxEmptyString) + { Close(); m_fp = lfp; m_name = name; } void Detach() { m_fp = NULL; } FILE *fp() const { return m_fp; } // 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();