Made wxBORDER_THEME the same as wxBORDER_DEFAULT

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

diff --git a/include/wx/memtext.h b/include/wx/memtext.h
index aa2df7b63756336a77163e70144ff756524dc6e1..23b7de18d316574a307a49e6d26b15d10edce2c0 100644 (file)
--- a/include/wx/memtext.h
+++ b/include/wx/memtext.h
@@ -37,11 +37,11 @@ protected:
     virtual bool OnClose()
         { return true; }
 
     virtual bool OnClose()
         { return true; }
 

-    virtual bool OnRead(wxMBConv& WXUNUSED(conv))
+    virtual bool OnRead(const wxMBConv& WXUNUSED(conv))

         { return true; }
 
     virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),
         { return true; }
 
     virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),

-                         wxMBConv& WXUNUSED(conv) = wxConvUTF8)
+                         const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8())

         { return true; }
 
 private:
         { return true; }
 
 private: