Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxDF_UNICODETEXT shouldn't be supported at all in ANSI build

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

9
src/gtk/dataobj.cpp
View File

@@ -81,10 +81,13 @@ void wxDataFormat::SetType( wxDataFormatId type )
m_format = g_textAtom; m_format = g_textAtom;
else if (m_type == wxDF_TEXT) else if (m_type == wxDF_TEXT)
m_format = g_altTextAtom; m_format = g_altTextAtom;
#else #else // !wxUSE_UNICODE
if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT) // notice that we don't map wxDF_UNICODETEXT to g_textAtom here, this
// would lead the code elsewhere to treat data objects with this format as
// containing UTF-8 data which is not true
if (m_type == wxDF_TEXT)
m_format = g_textAtom; m_format = g_textAtom;
#endif #endif // wxUSE_UNICODE/!wxUSE_UNICODE
else else
if (m_type == wxDF_BITMAP) if (m_type == wxDF_BITMAP)
m_format = g_pngAtom; m_format = g_pngAtom;