Use wxClientDataDictionary for client data.

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

diff --git a/include/wx/file.h b/include/wx/file.h
index 0c644bfe03f273c48cee86a2a0fe97d4204a84f2..c11ea4d64877f9bf9afcc68cc253ab4ab7d918fd 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -13,13 +13,14 @@
 #ifndef _WX_FILEH__
 #define _WX_FILEH__
 
 #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"
 #pragma interface "file.h"
 #endif
 
 #ifndef WX_PRECOMP
   #include  "wx/string.h"
   #include  "wx/filefn.h"

+  #include  "wx/strconv.h"

 #endif
 
 #if wxUSE_FILE
 #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
     // 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);
   {
       const wxWX2MBbuf buf = s.mb_str(conv);
       size_t size = strlen(buf);