X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3a584a7a6ade199990dd4463488e4bbf3545349..f24badde9a0efe4e2a18057045e044542f582158:/include/wx/textbuf.h

diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h
index f5a44afe68..32d8379a0d 100644
--- a/include/wx/textbuf.h
+++ b/include/wx/textbuf.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TEXTBUFFER_H
 #define _WX_TEXTBUFFER_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "textbuf.h"
 #endif
 
@@ -42,7 +42,7 @@ enum wxTextFileType
 // wxTextBuffer
 // ----------------------------------------------------------------------------
 
-WX_DEFINE_EXPORTED_ARRAY(wxTextFileType, ArrayFileType);
+WX_DEFINE_EXPORTED_ARRAY_INT(wxTextFileType, ArrayFileType);
 
 #endif // wxUSE_TEXTBUFFER
 
@@ -81,10 +81,10 @@ public:
     bool Create(const wxString& strBufferName);
 
     // Open() also loads buffer in memory on success
-    bool Open(wxMBConv& conv = wxConvLibc);
+    bool Open(wxMBConv& conv = wxConvISO8859_1);
 
     // same as Open() but with (another) buffer name
-    bool Open(const wxString& strBufferName, wxMBConv& conv = wxConvLibc);
+    bool Open(const wxString& strBufferName, wxMBConv& conv = wxConvISO8859_1);
 
     // closes the buffer and frees memory, losing all changes
     bool Close();
@@ -148,7 +148,7 @@ public:
     // change the buffer (default argument means "don't change type")
     // possibly in another format
     bool Write(wxTextFileType typeNew = wxTextFileType_None,
-               wxMBConv& conv = wxConvLibc);
+               wxMBConv& conv = wxConvISO8859_1);
 
     // dtor
     virtual ~wxTextBuffer();
@@ -171,8 +171,7 @@ protected:
                         wxTextBufferOpenMode openmode) = 0;
     virtual bool OnClose() = 0;
     virtual bool OnRead(wxMBConv& conv) = 0;
-    virtual bool OnWrite(wxTextFileType typeNew,
-                        wxMBConv& conv = wxConvLibc) = 0;
+    virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv) = 0;
 
     wxString m_strBufferName;  // name of the buffer