From: Václav Slavík <vslavik@fastmail.fm>
Date: Tue, 12 Jun 2007 11:21:58 +0000 (+0000)
Subject: more STL fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ab6ef7e6e8b416ad036af09e6da7dab3de9e298d

more STL fixes


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

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index 89ad8d2de0..32288359f1 100644
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -276,9 +276,8 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
                 // function to unescape the 8-bit strings pointed to
                 // by buf, but this does the same in wx code.
                 wxString filename_unicode = wxURI::Unescape(filename.c_str() + lenPrefix);
-                wxCharBuffer filename_8bit = wxConvISO8859_1.cWX2MB( filename_unicode );
-                filename_unicode = wxConvFileName->cMB2WX( filename_8bit );
-                AddFile( filename_unicode );
+                wxCharBuffer filename_8bit = filename_unicode.mb_str(wxConvISO8859_1);
+                AddFile(wxString(filename_8bit, *wxConvFileName));
                 filename.Empty();
             }
             else if ( !filename.empty() )