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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-21 03:39:40 +00:00
parent 5b774e5249
commit 1b8cb9ac59

View File

@@ -282,11 +282,14 @@ selection_handler( GtkWidget *WXUNUSED(widget),
if (size == 0) return;
void *d = malloc(size);
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() );
// 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
// 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()
@@ -294,20 +297,19 @@ selection_handler( GtkWidget *WXUNUSED(widget),
{
gtk_selection_data_set_text(
selection_data,
(const gchar*)d,
(const gchar*)buf.data(),
size );
}
else
#endif // wxUSE_UNICODE
{
gtk_selection_data_set(
selection_data,
GDK_SELECTION_TYPE_STRING,
8*sizeof(gchar),
(unsigned char*) d,
(const guchar*)buf.data(),
size );
}
free(d);
}
}