return const wxString& from wxFontMapper::GetDefaultConfigPath()

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

diff --git a/include/wx/memtext.h b/include/wx/memtext.h
index 614286ef2333eca39ddeaef6ea14cfaa2c431d46..23b7de18d316574a307a49e6d26b15d10edce2c0 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
-// Copyright:   (c) 2001 wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) 2001 Morten Hanssen
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMTEXT_H
@@ -19,7 +19,7 @@
 // wxMemoryText
 // ----------------------------------------------------------------------------
 
-class wxMemoryText : public wxTextBuffer
+class WXDLLIMPEXP_BASE wxMemoryText : public wxTextBuffer
 {
 public:
     // Constructors.
@@ -30,19 +30,22 @@ protected:
     virtual bool OnExists() const
         { return false; }
 
-    virtual bool OnOpen(const wxString &strBufferName,
-                        wxTextBufferOpenMode OpenMode)
+    virtual bool OnOpen(const wxString & WXUNUSED(strBufferName),
+                        wxTextBufferOpenMode WXUNUSED(OpenMode))
         { return true; }
 
     virtual bool OnClose()
         { return true; }
 
-    virtual bool OnRead(wxMBConv& conv)
+    virtual bool OnRead(const wxMBConv& WXUNUSED(conv))
         { return true; }
 
-    virtual bool OnWrite(wxTextFileType typeNew,
-                         wxMBConv& conv = wxConvLibc)
+    virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),
+                         const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8())
         { return true; }
+
+private:
+    DECLARE_NO_COPY_CLASS(wxMemoryText)
 };
 
 #endif // wxUSE_TEXTBUFFER