X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5aa67d6619d7758bd66375ef75b698ae49f3418b..6337cacce92d9d3f3d453753102a152ace004b60:/src/mac/carbon/dataobj.cpp diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp index 9e42e47a49..3ace48bcd8 100644 --- a/src/mac/carbon/dataobj.cpp +++ b/src/mac/carbon/dataobj.cpp @@ -14,12 +14,13 @@ #if wxUSE_DATAOBJ +#include "wx/dataobj.h" + #ifndef WX_PRECOMP -#include "wx/intl.h" + #include "wx/intl.h" + #include "wx/log.h" #endif -#include "wx/log.h" -#include "wx/dataobj.h" #include "wx/dcmemory.h" #include "wx/mstream.h" #include "wx/image.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( wxConvFileName->cMB2WX( (const char*)pBuf ), wxConvLocal ); #endif m_filenames = wxStringTokenize( filenames, wxT("\n"), wxTOKEN_STRTOK );