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

correcting unicode data conversion

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-08-28 08:45:42 +00:00
parent b94aea9304
commit b3370ae5d8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/dobjcmn.cpp
View File

@@ -290,8 +290,7 @@ size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
{ {
// host native is UTF16 // host native is UTF16
wxMBConvUTF16BE converter ; wxMBConvUTF16BE converter ;
wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() ); return converter.WC2MB( NULL , GetText().c_str() , 0 ) + 2; // add space for trailing unichar 0
return strlen( (const char*) buffer ) + 1;
} }
else // == wxDF_TEXT else // == wxDF_TEXT
{ {
@@ -306,8 +305,9 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
{ {
// host native is UTF16 // host native is UTF16
wxMBConvUTF16BE converter ; wxMBConvUTF16BE converter ;
size_t len = converter.WC2MB( NULL , GetText().c_str() , 0 ) ;
wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() ); wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() );
strcpy( (char*) buf, (const char*) buffer ); memcpy( (char*) buf, (const char*) buffer , len + 2); // trailing unichar 0
} }
else else
{ {