X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/681641370ce8422109c811db9ee17b690ddf639c..99ab3e3f56ab43fe1127eb565cad1a619cad0499:/include/wx/file.h diff --git a/include/wx/file.h b/include/wx/file.h index 0c644bfe03..c11ea4d648 100644 --- a/include/wx/file.h +++ b/include/wx/file.h @@ -13,13 +13,14 @@ #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 @@ -99,7 +100,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 = wxConvLocal) { const wxWX2MBbuf buf = s.mb_str(conv); size_t size = strlen(buf);