From ab250e5c4756eaa8baa2df5a5f3594a4fd7685dd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Sep 2007 00:32:56 +0000 Subject: [PATCH] don't pass garbage to SetData() in wxURLDataObject::SetURL() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/ole/dataobj.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 3831f98b1a..bc81929a07 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -1216,9 +1216,9 @@ public: wxURLDataObject::wxURLDataObject(const wxString& url) { - // we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same - // but it seems that some browsers only provide one of them so we have to - // support both + // we support CF_TEXT and CFSTR_SHELLURL formats which are basically the + // same but it seems that some browsers only provide one of them so we have + // to support both Add(new wxTextDataObject); Add(new CFSTR_SHELLURLDataObject()); @@ -1255,13 +1255,15 @@ wxString wxURLDataObject::GetURL() const void wxURLDataObject::SetURL(const wxString& url) { - SetData(wxDataFormat(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT), - url.Length()+1, url.c_str()); + wxCharBuffer urlMB(url.mb_str()); + if ( urlMB ) + { + const size_t len = strlen(urlMB) + 1; // size with trailing NUL + SetData(wxDF_TEXT, len, urlMB); + SetData(wxDataFormat(CFSTR_SHELLURL), len, urlMB); + } - // CFSTR_SHELLURL is always supposed to be ANSI... - wxWX2MBbuf urlA = (wxWX2MBbuf)url.mbc_str(); - size_t len = strlen(urlA); - SetData(wxDataFormat(CFSTR_SHELLURL), len+1, (const char*)urlA); + SetData(wxDF_UNICODETEXT, url.length() + 1, url.wc_str()); } // ---------------------------------------------------------------------------- -- 2.45.2