Fix for windres flags used in Win64 mingw build.

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

diff --git a/include/wx/memtext.h b/include/wx/memtext.h
index 31e346ecbb337bbc7b5ca560e94e9195f6fdfb0a..475e8fdc23ff5c355cfbdd61f62be8229ea0d9c7 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 wxWidgets team
+// Copyright:   (c) 2001 Morten Hanssen

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


@@ -37,15 +37,15 @@ 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:

-    DECLARE_NO_COPY_CLASS(wxMemoryText)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryText);

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