Initial work on virtual file system support for the WebKitGTK+ backend. It now suppor...

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 28b43e826f0aebeb4c6a8dab3ba002501aa25a65..e306437de465ee11be4fbde3186805ad3ee035e0 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -186,15 +186,13 @@ void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
                                                 const wxString& textdata,
                                                 const wxString& mimetype)
 {
                                                 const wxString& textdata,
                                                 const wxString& mimetype)
 {

-#if wxUSE_UNICODE
-    const wxScopedCharBuffer data(textdata.To8BitData());
-#else
-    const wxString& data = textdata;
-#endif
-
-    AddFileWithMimeType(filename,
-                        static_cast<const char *>(data), data.length(),
-                        mimetype);
+    AddFileWithMimeType
+    (
+        filename,
+        static_cast<const char *>(textdata.To8BitData()),
+        wxStrlen(static_cast<const char *>(textdata.To8BitData())),
+        mimetype
+    );

 }
 
 
 }
 
 


@@ -255,7 +253,7 @@ wxMemoryFSHandler::AddFile(const wxString& filename,
         return;
 
     wxMemoryOutputStream mems;
         return;
 
     wxMemoryOutputStream mems;

-    if ( image.Ok() && image.SaveFile(mems, type) )
+    if ( image.IsOk() && image.SaveFile(mems, type) )

     {
         m_Hash[filename] = new wxMemoryFSFile
                                (
     {
         m_Hash[filename] = new wxMemoryFSFile
                                (