implement wxBitmapButton::DoGetBestSize

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

diff --git a/include/wx/memtext.h b/include/wx/memtext.h
index 614286ef2333eca39ddeaef6ea14cfaa2c431d46..44567134b8055d18b05b96e0fe09213e3a6a189a 100644 (file)
--- a/include/wx/memtext.h
+++ b/include/wx/memtext.h
@@ -4,7 +4,7 @@
 // Created:     14.11.01
 // Author:      Morten Hanssen
 // Copyright:   (c) 2001 wxWindows team
 // Created:     14.11.01
 // Author:      Morten Hanssen
 // Copyright:   (c) 2001 wxWindows team

-// Licence:     wxWindows license
+// 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 &strBufferName,
-                        wxTextBufferOpenMode OpenMode)
-        { return true; }
+    virtual bool OnOpen(const wxString & WXUNUSED(strBufferName),
+                        wxTextBufferOpenMode WXUNUSED(OpenMode))
+        { return TRUE; }

 
     virtual bool OnClose()
 
     virtual bool OnClose()

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

 
 

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

 
 

-    virtual bool OnWrite(wxTextFileType typeNew,
-                         wxMBConv& conv = wxConvLibc)
-        { return true; }
+    virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),
+                         wxMBConv& WXUNUSED(conv) = wxConvUTF8)
+        { return TRUE; }
+
+private:
+    DECLARE_NO_COPY_CLASS(wxMemoryText)

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