Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Another blind fix for wxTextDataObject under macOS

Browse Source 
Use the length provided to SetData() instead of assuming it is NUL-terminated
in the wxNEEDS_UTF16_FOR_TEXT_DATAOBJ case too, and not only in the
wxNEEDS_UTF8_FOR_TEXT_DATAOBJ onem, as was done by the previous attempt to fix
this in 20c130a578.

Closes #9522.
This commit is contained in:
Vadim Zeitlin
2016-11-26 18:44:00 +01:00
parent cb2474f040
commit 110d1b03e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/dobjcmn.cpp
View File

@@ -394,13 +394,13 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
} }
bool wxTextDataObject::SetData(const wxDataFormat& format, bool wxTextDataObject::SetData(const wxDataFormat& format,
size_t WXUNUSED(len), size_t len,
const void *buf) const void *buf)
{ {
if ( buf == NULL ) if ( buf == NULL )
return false; return false;
SetText(GetConv(format).cMB2WX(static_cast<const char*>(buf))); SetText(GetConv(format).cMB2WC(static_cast<const char*>(buf), len, NULL));
return true; return true;
} }