Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't pass garbage to SetData() in wxURLDataObject::SetURL()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-08 00:32:56 +00:00
parent 4baf78001e
commit ab250e5c47
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/ole/dataobj.cpp
View File

@@ -1216,9 +1216,9 @@ public:
wxURLDataObject::wxURLDataObject(const wxString& url) wxURLDataObject::wxURLDataObject(const wxString& url)
{ {
// we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same // we support CF_TEXT and CFSTR_SHELLURL formats which are basically the
// but it seems that some browsers only provide one of them so we have to // same but it seems that some browsers only provide one of them so we have
// support both // to support both
Add(new wxTextDataObject); Add(new wxTextDataObject);
Add(new CFSTR_SHELLURLDataObject()); Add(new CFSTR_SHELLURLDataObject());
@@ -1255,13 +1255,15 @@ wxString wxURLDataObject::GetURL() const
void wxURLDataObject::SetURL(const wxString& url) void wxURLDataObject::SetURL(const wxString& url)
{ {
SetData(wxDataFormat(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT), wxCharBuffer urlMB(url.mb_str());
url.Length()+1, url.c_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... SetData(wxDF_UNICODETEXT, url.length() + 1, url.wc_str());
wxWX2MBbuf urlA = (wxWX2MBbuf)url.mbc_str();
size_t len = strlen(urlA);
SetData(wxDataFormat(CFSTR_SHELLURL), len+1, (const char*)urlA);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------