X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28f92d74ee73176fc391fb8c3de75c76dd086319..68ca12fef650ce4622e05ba4eb21a7aa23849107:/src/x11/clipbrd.cpp?ds=sidebyside

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index 1ae753aec7..a523296de8 100644
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -32,11 +32,17 @@ Atom  g_clipboardAtom   = 0;
 Atom  g_targetsAtom     = 0;
 #endif
 
+// avoid warnings about unused static variable (notice that we still use it
+// even in release build if the compiler doesn't support variadic macros)
+#if defined(__WXDEBUG__) || !defined(HAVE_VARIADIC_MACROS)
+
 // the trace mask we use with wxLogTrace() - call
 // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
 // (there will be a *lot* of them!)
 static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
 
+#endif // __WXDEBUG__
+
 //-----------------------------------------------------------------------------
 // reminder
 //-----------------------------------------------------------------------------
@@ -249,7 +255,7 @@ selection_handler( GtkWidget *WXUNUSED(widget),
 
     // transform Unicode text into multibyte before putting it on clipboard
 #if wxUSE_UNICODE
-    if ( format.GetType() == wxDF_TEXT )
+    if ( format.GetType() == wxDF_TEXT || format.GetType() == wxDF_UNICODETEXT)
     {
         const wchar_t *wstr = (const wchar_t *)d;
         size_t len = wxConvCurrent->WC2MB(NULL, wstr, 0);
@@ -300,8 +306,6 @@ wxClipboard::wxClipboard()
 
     m_formatSupported = false;
     m_targetRequested = 0;
-
-    m_usePrimary = false;
 }
 
 wxClipboard::~wxClipboard()