AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't call gtk_selection_data_set_text() with non-UTF-8 data as we did in ANSI build (#2037)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-07-21 03:39:40 +00:00
parent 73597f8aff
commit b82c3e606c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/clipbrd.cpp
View File

@ -299,29 +299,29 @@ selection_handler( GtkWidget *WXUNUSED(widget),
if (size == 0) return;
void *d = malloc(size);
wxON_BLOCK_EXIT1(free, d);
wxCharBuffer buf(size);
// Text data will be in UTF8 in Unicode mode.
data->GetDataHere( selection_data->target, d );
// text data must be returned in UTF8 if format is wxDF_UNICODETEXT
data->GetDataHere( format, buf.data() );
// NB: GTK+ requires special treatment of UTF8_STRING data, the text
// would show as UTF-8 data interpreted as latin1 (?) in other
// GTK+ apps if we used gtk_selection_data_set()
// use UTF8_STRING format if requested in Unicode build but just plain
// STRING one in ANSI or if explicitly asked in Unicode
#if wxUSE_UNICODE
if (format == wxDataFormat(wxDF_UNICODETEXT))
{
gtk_selection_data_set_text(
selection_data,
(const gchar*)d,
(const gchar*)buf.data(),
size );
}
else
#endif
{
gtk_selection_data_set(
selection_data,
GDK_SELECTION_TYPE_STRING,
8*sizeof(gchar),
(unsigned char*) d,
(const guchar*)buf.data(),
size );
}
}