Add wxDataViewRendererBase::GetEffectiveAlignment() and use it.

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

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 8da6e31ffa33a1c36ffe0615822a46a8c956202b..e6aa3ba6634e6657ca6475300d0c3ce401412fc9 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -6,7 +6,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.98
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -14,10 +13,6 @@
 #ifndef _WX_TEXTFILE_H
 #define _WX_TEXTFILE_H
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "textfile.h"
-#endif
-
 #include "wx/defs.h"
 
 #include "wx/textbuf.h"
@@ -30,7 +25,7 @@
 // wxTextFile
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxTextFile : public wxTextBuffer
+class WXDLLIMPEXP_BASE wxTextFile : public wxTextBuffer
 {
 public:
     // constructors
@@ -43,11 +38,14 @@ protected:
     virtual bool OnOpen(const wxString &strBufferName,
                         wxTextBufferOpenMode OpenMode);
     virtual bool OnClose();
-    virtual bool OnRead(wxMBConv& conv);
-    virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv);
+    virtual bool OnRead(const wxMBConv& conv);
+    virtual bool OnWrite(wxTextFileType typeNew, const wxMBConv& conv);
 
 private:
+
     wxFile m_file;
+
+    wxDECLARE_NO_COPY_CLASS(wxTextFile);
 };
 
 #else // !wxUSE_TEXTFILE