X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/681641370ce8422109c811db9ee17b690ddf639c..ae8c4b33a3272fba39c405542141e7c486b75136:/include/wx/file.h diff --git a/include/wx/file.h b/include/wx/file.h index 0c644bfe03..8a382583ee 100644 --- a/include/wx/file.h +++ b/include/wx/file.h @@ -7,19 +7,20 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FILEH__ #define _WX_FILEH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "file.h" #endif #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/filefn.h" + #include "wx/strconv.h" #endif #if wxUSE_FILE @@ -52,7 +53,8 @@ // NB: for space efficiency this class has no virtual functions, including // dtor which is _not_ virtual, so it shouldn't be used as a base class. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFile + +class WXDLLIMPEXP_BASE wxFile { public: // more file constants @@ -99,7 +101,7 @@ 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, wxMBConv& conv = wxConvLibc) + bool Write(const wxString& s, wxMBConv& conv = wxConvUTF8) { const wxWX2MBbuf buf = s.mb_str(conv); size_t size = strlen(buf); @@ -147,7 +149,8 @@ private: // file (and close this one) or call Discard() to cancel the modification. If // you call neither of them, dtor will call Discard(). // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTempFile + +class WXDLLIMPEXP_BASE wxTempFile { public: // ctors @@ -164,7 +167,8 @@ public: // I/O (both functions return true on success, false on failure) bool Write(const void *p, size_t n) { return m_file.Write(p, n) != 0; } - bool Write(const wxString& str, wxMBConv& conv = wxConvLibc) { return m_file.Write(str, conv); } + bool Write(const wxString& str, wxMBConv& conv = wxConvUTF8) + { return m_file.Write(str, conv); } // different ways to close the file // validate changes and delete the old file of name m_strName