Use wmain() if supported by the compiler/CRT instead of main().

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

diff --git a/include/wx/memtext.h b/include/wx/memtext.h
index 92617b24f16db3018317ae9e6dfd7febb3b8975a..475e8fdc23ff5c355cfbdd61f62be8229ea0d9c7 100644 (file)
--- a/include/wx/memtext.h
+++ b/include/wx/memtext.h
@@ -3,8 +3,8 @@
 // Purpose:     wxMemoryText allows to use wxTextBuffer without a file
 // Created:     14.11.01
 // Author:      Morten Hanssen
 // Purpose:     wxMemoryText allows to use wxTextBuffer without a file
 // Created:     14.11.01
 // Author:      Morten Hanssen

-// Copyright:   (c) 2001 wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) 2001 Morten Hanssen
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMTEXT_H
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMTEXT_H


@@ -19,7 +19,7 @@
 // wxMemoryText
 // ----------------------------------------------------------------------------
 
 // wxMemoryText
 // ----------------------------------------------------------------------------
 

-class wxMemoryText : public wxTextBuffer
+class WXDLLIMPEXP_BASE wxMemoryText : public wxTextBuffer

 {
 public:
     // Constructors.
 {
 public:
     // Constructors.


@@ -28,21 +28,24 @@ public:
 
 protected:
     virtual bool OnExists() const
 
 protected:
     virtual bool OnExists() const

-        { return FALSE; }
+        { return false; }

 
     virtual bool OnOpen(const wxString & WXUNUSED(strBufferName),
                         wxTextBufferOpenMode WXUNUSED(OpenMode))
 
     virtual bool OnOpen(const wxString & WXUNUSED(strBufferName),
                         wxTextBufferOpenMode WXUNUSED(OpenMode))

-        { return TRUE; }
+        { return true; }

 
     virtual bool OnClose()
 
     virtual bool OnClose()

-        { return TRUE; }
+        { return true; }

 
 

-    virtual bool OnRead(wxMBConv& WXUNUSED(conv))
-        { return TRUE; }
+    virtual bool OnRead(const wxMBConv& WXUNUSED(conv))
+        { return true; }

 
     virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),
 
     virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),

-                         wxMBConv& WXUNUSED(conv) = wxConvLibc)
-        { return TRUE; }
+                         const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8())
+        { return true; }
+
+private:
+    wxDECLARE_NO_COPY_CLASS(wxMemoryText);

 };
 
 #endif // wxUSE_TEXTBUFFER
 };
 
 #endif // wxUSE_TEXTBUFFER