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

don't confuse wxDF_UNICODETEXT and wxDF_TEXT

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2004-06-10 19:24:08 +00:00
parent 0ee43a72dd
commit 810324c83b
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/dataobj.cpp
View File

@ -80,8 +80,15 @@ void wxDataFormat::SetType( wxDataFormatId type )
m_type = type;
#if wxUSE_UNICODE
if (m_type == wxDF_UNICODETEXT)
m_format = g_textAtom;
else if (m_type == wxDF_TEXT)
m_format = g_altTextAtom;
#else
if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)
m_format = g_textAtom;
#endif
else
if (m_type == wxDF_BITMAP)
m_format = g_pngAtom;
@ -111,6 +118,13 @@ void wxDataFormat::SetId( NativeFormat format )
m_format = format;
if (m_format == g_textAtom)
#if wxUSE_UNICODE
m_type = wxDF_UNICODETEXT;
#else
m_type = wxDF_TEXT;
#endif
else
if (m_format == g_altTextAtom)
m_type = wxDF_TEXT;
else
if (m_format == g_pngAtom)

14
src/gtk1/dataobj.cpp
View File

@ -80,8 +80,15 @@ void wxDataFormat::SetType( wxDataFormatId type )
m_type = type;
#if wxUSE_UNICODE
if (m_type == wxDF_UNICODETEXT)
m_format = g_textAtom;
else if (m_type == wxDF_TEXT)
m_format = g_altTextAtom;
#else
if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)
m_format = g_textAtom;
#endif
else
if (m_type == wxDF_BITMAP)
m_format = g_pngAtom;
@ -111,6 +118,13 @@ void wxDataFormat::SetId( NativeFormat format )
m_format = format;
if (m_format == g_textAtom)
#if wxUSE_UNICODE
m_type = wxDF_UNICODETEXT;
#else
m_type = wxDF_TEXT;
#endif
else
if (m_format == g_altTextAtom)
m_type = wxDF_TEXT;
else
if (m_format == g_pngAtom)