wxXmlNode::GetAttribute's pointer argument must not be NULL, check for it

[wxWidgets.git] / src / x11 / clipbrd.cpp

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index c5abc23ce88e6af356b4a22c2de1085594c321ba..a523296de8f9179c56a05b398c8832896534deca 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -32,11 +32,15 @@ Atom  g_clipboardAtom   = 0;
 Atom  g_targetsAtom     = 0;
 #endif
 
-#ifdef __WXDEBUG__
+// 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__
 
 //-----------------------------------------------------------------------------
@@ -302,8 +306,6 @@ wxClipboard::wxClipboard()
 
     m_formatSupported = false;
     m_targetRequested = 0;
-
-    m_usePrimary = false;
 }
 
 wxClipboard::~wxClipboard()