deal with the situation when a (dynamic) event handler disconnects itself during...

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

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index 0e57fb9ba29c8b4e5ff88573c6b418f5963740dc..ee100b5bcf093cc145687925c7f8799e9dd4af54 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -8,10 +8,6 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "clipbrd.h"
-#endif
-

 #include "wx/clipbrd.h"
 
 #if wxUSE_CLIPBOARD
 #include "wx/clipbrd.h"
 
 #if wxUSE_CLIPBOARD


@@ -26,8 +22,10 @@
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

+#if !wxUSE_NANOX

 Atom  g_clipboardAtom   = 0;
 Atom  g_targetsAtom     = 0;
 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
 
 // the trace mask we use with wxLogTrace() - call
 // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here


@@ -290,10 +288,11 @@ wxClipboard::wxClipboard()
     /* we use m_targetsWidget to query what formats are available */
 
     /* we use m_clipboardWidget to get and to offer data */
     /* 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 );
     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;
 
     m_formatSupported = FALSE;
     m_targetRequested = 0;
 


@@ -377,6 +376,9 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( 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") );
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );


@@ -390,9 +392,11 @@ bool wxClipboard::AddData( wxDataObject *data )
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
 
     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;
     /* 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++)
 
 
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)


@@ -440,6 +444,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 #endif
 
     return res;
 #endif
 
     return res;

+#endif

 }
 
 void wxClipboard::Close()
 }
 
 void wxClipboard::Close()