Lots more Unicode fixes.
wxClipboard fixes for GTK2 and UTF8. wxFileConfig now uses wxConvLocal to convert text and doesn't crash anymore.. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -72,8 +72,12 @@ wxDataFormat::wxDataFormat( NativeFormat format )
|
||||
void wxDataFormat::SetType( wxDataFormatId type )
|
||||
{
|
||||
PrepareFormats();
|
||||
m_type = type;
|
||||
|
||||
if (type == wxDF_UNICODETEXT)
|
||||
type = wxDF_TEXT;
|
||||
|
||||
m_type = type;
|
||||
|
||||
if (m_type == wxDF_TEXT)
|
||||
m_format = g_textAtom;
|
||||
else
|
||||
@@ -135,7 +139,7 @@ void wxDataFormat::PrepareFormats()
|
||||
// here (with whom?)
|
||||
if (!g_textAtom)
|
||||
#if wxUSE_UNICODE
|
||||
g_textAtom = gdk_atom_intern( "text/utf8", FALSE );
|
||||
g_textAtom = gdk_atom_intern( "UTF8_STRING", FALSE );
|
||||
#else
|
||||
g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE );
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user