put wxUSE_DATAVIEWCTRL in alphabetical order

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

diff --git a/include/wx/memtext.h b/include/wx/memtext.h
index 3cf08b78357bd0fed6c7b9f0dd5a8f722569d15c..a093f40b040c5e305248e62e57d11b0344dfbba0 100644 (file)
--- a/include/wx/memtext.h
+++ b/include/wx/memtext.h
@@ -3,7 +3,7 @@
 // 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
+// Copyright:   (c) 2001 Morten Hanssen

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


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

-class WXDLLEXPORT_BASE 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) = wxConvUTF8)
-        { return TRUE; }
+                         const wxMBConv& WXUNUSED(conv) = wxConvUTF8)
+        { return true; }
+
+private:
+    DECLARE_NO_COPY_CLASS(wxMemoryText)

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