allow 2 step creation of wxDocChildFrameAnyBase and derived classes

[wxWidgets.git] / src / common / fs_mem.cpp

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 2e9927590d667c48a4173d903575eaa83d387d4d..28b43e826f0aebeb4c6a8dab3ba002501aa25a65 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -70,7 +70,7 @@ private:
 #endif // wxUSE_DATETIME
     }
 
-    DECLARE_NO_COPY_CLASS(wxMemoryFSFile)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryFSFile);
 };
 
 #if wxUSE_BASE
@@ -186,8 +186,14 @@ void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
                                                 const wxString& textdata,
                                                 const wxString& mimetype)
 {
+#if wxUSE_UNICODE
+    const wxScopedCharBuffer data(textdata.To8BitData());
+#else
+    const wxString& data = textdata;
+#endif
+
     AddFileWithMimeType(filename,
-                        (const void*) textdata.mb_str(), textdata.length(),
+                        static_cast<const char *>(data), data.length(),
                         mimetype);
 }