X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c601df457c536b243b4b526b43442fdd1863534f..462bc04863a27a56a75faf72c20977a2e958c2a5:/include/wx/file.h diff --git a/include/wx/file.h b/include/wx/file.h index c11ea4d648..8a382583ee 100644 --- a/include/wx/file.h +++ b/include/wx/file.h @@ -7,7 +7,7 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FILEH__ @@ -53,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 @@ -100,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 = wxConvLocal) + bool Write(const wxString& s, wxMBConv& conv = wxConvUTF8) { const wxWX2MBbuf buf = s.mb_str(conv); size_t size = strlen(buf); @@ -148,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 @@ -165,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