wxGTK2: No need to check for __WXGTK20__ here either (and test cia script again)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,7 +35,7 @@ GdkAtom g_clipboardAtom = 0;
|
|||||||
GdkAtom g_targetsAtom = 0;
|
GdkAtom g_targetsAtom = 0;
|
||||||
GdkAtom g_timestampAtom = 0;
|
GdkAtom g_timestampAtom = 0;
|
||||||
|
|
||||||
#if defined(__WXGTK20__) && wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
extern GdkAtom g_altTextAtom;
|
extern GdkAtom g_altTextAtom;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -548,7 +548,7 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
|
|||||||
|
|
||||||
while (m_waiting) gtk_main_iteration();
|
while (m_waiting) gtk_main_iteration();
|
||||||
|
|
||||||
#if defined(__WXGTK20__) && wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
if (!m_formatSupported && format == wxDataFormat(wxDF_UNICODETEXT))
|
if (!m_formatSupported && format == wxDataFormat(wxDF_UNICODETEXT))
|
||||||
{
|
{
|
||||||
// Another try with plain STRING format
|
// Another try with plain STRING format
|
||||||
|
Reference in New Issue
Block a user