From 01943fa2ea20763cc242917c705daa0c67f324de Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 5 Sep 2009 12:39:26 +0000 Subject: [PATCH] Really fix compilation of wxURLDataObject. Conversion from char* to wxString doesn't exist in 2.8, need to do it explicitly. Closes #11102. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@61835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/ole/dataobj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 92a33905d3..e01d3d37a3 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -1245,7 +1245,7 @@ wxString wxURLDataObject::GetURL() const wxCharBuffer buf(len); if ( m_dataObjectLast->GetDataHere(buf.data()) ) - url = buf; + url = wxString(buf, wxConvLibc); #else // !wxUSE_UNICODE // in ANSI build no conversion is necessary m_dataObjectLast->GetDataHere(wxStringBuffer(url, len));