X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..1338c59a025505bc066be220fe56e898a72b3ad3:/include/wx/ffile.h?ds=inline diff --git a/include/wx/ffile.h b/include/wx/ffile.h index 640becf4c5..33f0725af7 100644 --- a/include/wx/ffile.h +++ b/include/wx/ffile.h @@ -1,22 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: ffile.h +// Name: wx/ffile.h // Purpose: wxFFile - encapsulates "FILE *" stream // Author: Vadim Zeitlin // Modified by: // Created: 14.07.99 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FFILE_H_ #define _WX_FFILE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "ffile.h" #endif -#if wxUSE_FILE +#include "wx/defs.h" // for wxUSE_FFILE + +#if wxUSE_FFILE #ifndef WX_PRECOMP #include "wx/string.h" @@ -40,18 +42,18 @@ public: // def ctor wxFFile() { m_fp = NULL; } // open specified file (may fail, use IsOpened()) - wxFFile(const wxChar *filename, const char *mode = "r"); + wxFFile(const wxChar *filename, const wxChar *mode = _T("r")); // attach to (already opened) file wxFFile(FILE *fp) { m_fp = fp; } // open/close // open a file (existing or not - the mode controls what happens) - bool Open(const wxChar *filename, const char *mode = "r"); + bool Open(const wxChar *filename, const wxChar *mode = _T("r")); // closes the opened file (this is a NOP if not opened) bool Close(); // assign an existing file descriptor and get it back from wxFFile object - void Attach(FILE *fp, const wxString& name = T("")) + void Attach(FILE *fp, const wxString& name = wxT("")) { Close(); m_fp = fp; m_name = name; } void Detach() { m_fp = NULL; } FILE *fp() const { return m_fp; } @@ -65,10 +67,11 @@ public: // returns the number of bytes written size_t Write(const void *pBuf, size_t nCount); // returns true on success - bool Write(const wxString& s) + bool Write(const wxString& s, wxMBConv& conv = wxConvUTF8) { - size_t size = s.Len()*sizeof(wxChar); - return Write(s.c_str(), size) == size; + const wxWX2MBbuf buf = s.mb_str(conv); + size_t size = strlen(buf); + return Write((const char *)buf, size) == size; } // flush data not yet written bool Flush(); @@ -108,7 +111,7 @@ private: wxString m_name; // the name of the file (for diagnostic messages) }; -#endif // wxUSE_FILE +#endif // wxUSE_FFILE #endif // _WX_FFILE_H_