From: Julian Smart Date: Sat, 5 Nov 2005 10:25:59 +0000 (+0000) Subject: Set HTML data even in Unicode mode X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6270539bcf24f2ec32150a09f8aad383f5de0671?ds=inline Set HTML data even in Unicode mode git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index aa6edf6fad..044ef30db2 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -294,8 +294,8 @@ bool wxSetClipboardData(wxDataFormat dataFormat, handle = SetClipboardData(dataFormat, hGlobalMemory); break; } - // Only tested with non-Unicode, Visual C++ 6.0 so far -#if defined(__VISUALC__) && !defined(UNICODE) + // Only tested with Visual C++ 6.0 so far +#if defined(__VISUALC__) case wxDF_HTML: { char* html = (char *)data; @@ -332,19 +332,19 @@ bool wxSetClipboardData(wxDataFormat dataFormat, // string when you overwrite it so you follow up with code to replace // the 0 appended at the end with a '\r'... char *ptr = strstr(buf, "StartHTML"); - wsprintf(ptr+10, "%08u", strstr(buf, "") - buf); + sprintf(ptr+10, "%08u", strstr(buf, "") - buf); *(ptr+10+8) = '\r'; ptr = strstr(buf, "EndHTML"); - wsprintf(ptr+8, "%08u", strlen(buf)); + sprintf(ptr+8, "%08u", strlen(buf)); *(ptr+8+8) = '\r'; ptr = strstr(buf, "StartFragment"); - wsprintf(ptr+14, "%08u", strstr(buf, "