Committed a couple of IPC changes I forgot to do

[wxWidgets.git] / include / wx / file.h

diff --git a/include/wx/file.h b/include/wx/file.h
index 0c644bfe03f273c48cee86a2a0fe97d4204a84f2..73778df34d51eea35832a77e2a954451e63c7374 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -13,7 +13,7 @@
 #ifndef _WX_FILEH__
 #define _WX_FILEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "file.h"
 #endif
 
@@ -99,7 +99,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);