From fa2b06e7b1196bffc4e2f57ff710538e66118c32 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 28 May 2009 09:42:08 +0000 Subject: [PATCH] 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 --- src/common/fs_mem.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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(data), data.length(), - mimetype); + AddFileWithMimeType + ( + filename, + static_cast(textdata.To8BitData()), + data.length(), + mimetype + ); } -- 2.45.2