From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 28 May 2009 09:42:08 +0000 (+0000)
Subject: compilation fix for STL/!UNICODE case (closes #10846)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fa2b06e7b1196bffc4e2f57ff710538e66118c32?ds=sidebyside;hp=e3d6cbb9aa8ba6fbd05066be093ee2b5f14fcea6

compilation fix for STL/!UNICODE case (closes #10846)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 28b43e826f..6503834972 100644
--- 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)
 {
-#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
+    );
 }