From 7962c237ddb76ce39b2784776098eb5154002d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 9 Nov 2002 00:32:30 +0000 Subject: [PATCH] Unicode fixes for OLE files (I don't know if I used correct conversion objects!) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/ole/automtn.cpp | 3 ++- src/msw/ole/dataobj.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp index 826bfe2cb3..312dee2977 100644 --- a/src/msw/ole/automtn.cpp +++ b/src/msw/ole/automtn.cpp @@ -837,7 +837,8 @@ static wxString ConvertStringFromOle(BSTR bStr) char *buf = new char[len]; (void)wcstombs( buf, bStr, len); - wxString str(buf); + // FIXME -- use bStr directly in Unicode mode? + wxString str(buf, wxConvLibc); delete[] buf; return str; } diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index a909b3e85e..3c66ba49e0 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -1098,7 +1098,7 @@ protected: // CFSTR_SHELLURL is _always_ ANSI! wxCharBuffer char_buffer( GetDataSize() ); wxCustomDataObject::GetDataHere( (void*)char_buffer.data() ); - wxString unicode_buffer( char_buffer ); + wxString unicode_buffer( char_buffer, wxConvLibc ); memcpy( buffer, unicode_buffer.c_str(), ( unicode_buffer.length() + 1 ) * sizeof(wxChar) );