fixed stupid code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -833,13 +833,15 @@ static BSTR ConvertStringToOle(const wxString& str)
|
|||||||
|
|
||||||
static wxString ConvertStringFromOle(BSTR bStr)
|
static wxString ConvertStringFromOle(BSTR bStr)
|
||||||
{
|
{
|
||||||
|
#if wxUSE_UNICODE
|
||||||
|
wxString str(bStr);
|
||||||
|
#else
|
||||||
int len = SysStringLen(bStr) + 1;
|
int len = SysStringLen(bStr) + 1;
|
||||||
char *buf = new char[len];
|
char *buf = new char[len];
|
||||||
(void)wcstombs( buf, bStr, len);
|
(void)wcstombs( buf, bStr, len);
|
||||||
|
wxString str(buf);
|
||||||
// FIXME -- use bStr directly in Unicode mode?
|
|
||||||
wxString str(buf, wxConvLibc);
|
|
||||||
delete[] buf;
|
delete[] buf;
|
||||||
|
#endif
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user