Added wxCriticalSection::TryEnter() method.

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

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 8da6e31ffa33a1c36ffe0615822a46a8c956202b..240817cfe289e72e92d6ada3dedbe3334019ba63 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -14,10 +14,6 @@
 #ifndef _WX_TEXTFILE_H
 #define _WX_TEXTFILE_H
 
 #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"
 #include "wx/defs.h"
 
 #include "wx/textbuf.h"


@@ -30,7 +26,7 @@
 // wxTextFile
 // ----------------------------------------------------------------------------
 
 // wxTextFile
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT_BASE wxTextFile : public wxTextBuffer
+class WXDLLIMPEXP_BASE wxTextFile : public wxTextBuffer

 {
 public:
     // constructors
 {
 public:
     // constructors


@@ -43,11 +39,14 @@ protected:
     virtual bool OnOpen(const wxString &strBufferName,
                         wxTextBufferOpenMode OpenMode);
     virtual bool OnClose();
     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:
 
 private:

+

     wxFile m_file;
     wxFile m_file;

+
+    wxDECLARE_NO_COPY_CLASS(wxTextFile);

 };
 
 #else // !wxUSE_TEXTFILE
 };
 
 #else // !wxUSE_TEXTFILE