From bf5d9fa4ea9f668eb45a0c5b48d6e35216e3c699 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 May 2004 18:52:43 +0000 Subject: [PATCH] fixed wxFileDataObject in Unicode build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 2 ++ src/msw/ole/dataobj.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 3a4d193342..0e615bdc58 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -136,6 +136,8 @@ wxMSW: - wxTaskBarIcon must be explicitly destroyed now, otherwise the application won't exit even though there are no top level windows - wxFileName::GetModificationTime() works with opened files too now +- wxDC::GetClippingBox() now works even for clipping regions created by Windows +- fixed wxFileDataObject in Unicode build (Alex D) wxMotif: diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 9c70b15cb0..14da1ff70c 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -1082,7 +1082,7 @@ bool wxFileDataObject::GetDataHere(void *pData) const { // copy filename to pbuf and add null terminator size_t len = m_filenames[i].Len(); - memcpy(pbuf, m_filenames[i], len); + memcpy(pbuf, m_filenames[i], len*sizeof(wxChar)); pbuf += len; *pbuf++ = wxT('\0'); } -- 2.45.2