Cleanup

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

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index 0e57fb9ba29c8b4e5ff88573c6b418f5963740dc..e9ba9c5a04572bf75156accad28f9e026ccf05f1 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -8,7 +8,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "clipbrd.h"
 #endif
 
@@ -26,8 +26,10 @@
 // data
 //-----------------------------------------------------------------------------
 
+#if !wxUSE_NANOX
 Atom  g_clipboardAtom   = 0;
 Atom  g_targetsAtom     = 0;
+#endif
 
 // the trace mask we use with wxLogTrace() - call
 // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
@@ -290,10 +292,11 @@ wxClipboard::wxClipboard()
     /* we use m_targetsWidget to query what formats are available */
 
     /* we use m_clipboardWidget to get and to offer data */
-
+#if !wxUSE_NANOX
     if (!g_clipboardAtom) g_clipboardAtom = XInternAtom( (Display*) wxGetDisplay(), "CLIPBOARD", False );
     if (!g_targetsAtom) g_targetsAtom = XInternAtom( (Display*) wxGetDisplay(), "TARGETS", False );
-
+#endif
+    
     m_formatSupported = FALSE;
     m_targetRequested = 0;
 
@@ -377,6 +380,9 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
+#if wxUSE_NANOX
+    return FALSE;
+#else
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
@@ -390,9 +396,11 @@ bool wxClipboard::AddData( wxDataObject *data )
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
 
+#if 0
     /* primary selection or clipboard */
     Atom clipboard = m_usePrimary ? (Atom) 1  // 1 = primary selection
                                   : g_clipboardAtom;
+#endif // 0
 
 
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)
@@ -440,6 +448,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 #endif
 
     return res;
+#endif
 }
 
 void wxClipboard::Close()