Allow wxStaticText to have a custom fg without a custom bg

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

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 01fe351f282f54e66797919044f15d56ba4ef877..a898f11543839fc25ffa961411f831c10cc15952 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -8,13 +8,13 @@
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTFILE_H
 #define _WX_TEXTFILE_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "textfile.h"
 #endif
 
@@ -30,7 +30,7 @@
 // wxTextFile
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTextFile : public wxTextBuffer
+class WXDLLIMPEXP_BASE wxTextFile : public wxTextBuffer
 {
 public:
     // constructors
@@ -44,10 +44,13 @@ 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;
+
+    DECLARE_NO_COPY_CLASS(wxTextFile)
 };
 
 #else // !wxUSE_TEXTFILE