From: Stefan Csomor Date: Sat, 28 Aug 2004 08:45:42 +0000 (+0000) Subject: correcting unicode data conversion X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b3370ae5d8607256d8ac65565c64e12db2d08278 correcting unicode data conversion git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index b16c8e219f..0957f4b47f 100644 --- a/src/common/dobjcmn.cpp +++ b/src/common/dobjcmn.cpp @@ -290,8 +290,7 @@ size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const { // host native is UTF16 wxMBConvUTF16BE converter ; - wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() ); - return strlen( (const char*) buffer ) + 1; + return converter.WC2MB( NULL , GetText().c_str() , 0 ) + 2; // add space for trailing unichar 0 } else // == wxDF_TEXT { @@ -306,8 +305,9 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const { // host native is UTF16 wxMBConvUTF16BE converter ; + size_t len = converter.WC2MB( NULL , GetText().c_str() , 0 ) ; 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 {