experimental --inplace flag implementation

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

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 477a023b011554d3cbcbd709f7beec0bcbbd8c4b..43024f64db468752f50568b1664b51ceefdb0ed8 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -14,16 +14,17 @@
 #ifndef _WX_TEXTFILE_H
 #define _WX_TEXTFILE_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "textfile.h"
 #endif
 
 #include "wx/defs.h"
 
+#include "wx/textbuf.h"
+
 #if wxUSE_TEXTFILE
 
 #include "wx/file.h"
-#include "wx/textbuf.h"
 
 // ----------------------------------------------------------------------------
 // wxTextFile
@@ -43,7 +44,7 @@ protected:
                         wxTextBufferOpenMode OpenMode);
     virtual bool OnClose();
     virtual bool OnRead(wxMBConv& conv);
-    virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv = wxConvLibc);
+    virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv);
 
 private:
     wxFile m_file;