]> git.saurik.com Git - wxWidgets.git/commitdiff
compilation fix for STL/!UNICODE case (closes #10846)
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 28 May 2009 09:42:08 +0000 (09:42 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 28 May 2009 09:42:08 +0000 (09:42 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/fs_mem.cpp

index 28b43e826f0aebeb4c6a8dab3ba002501aa25a65..6503834972df834212749f43f23770d2c7a8ad82 100644 (file)
@@ -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()),
+        data.length(),
+        mimetype
+    );
 }
 
 
 }