X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5aa67d6619d7758bd66375ef75b698ae49f3418b..3dcc2231fabc5c9ea718ae90d13fbc8dd70c3489:/src/mac/carbon/dataobj.cpp?ds=inline

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 9e42e47a49..cc1c352206 100644
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -14,15 +14,16 @@
 
 #if wxUSE_DATAOBJ
 
+#include "wx/dataobj.h"
+
 #ifndef WX_PRECOMP
-#include "wx/intl.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/log.h"
-#include "wx/dataobj.h"
-#include "wx/dcmemory.h"
 #include "wx/mstream.h"
-#include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/tokenzr.h"
 
@@ -250,7 +251,7 @@ bool wxFileDataObject::SetData( size_t nSize, const void *pBuf )
 #if wxUSE_UNICODE
     filenames = wxString( (const char*)pBuf, *wxConvFileName );
 #else
-    filenames = wxString( wxConvFileName->cMB2WX( pBuf ), wxConvLocal );
+    filenames = wxString (wxConvLocal.cWC2WX(wxConvFileName->cMB2WC( (const char*)pBuf)));
 #endif
 
     m_filenames = wxStringTokenize( filenames, wxT("\n"), wxTOKEN_STRTOK );