Applied patch 1055774 from Paul Cornett for platforms

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

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index e315f5a4ccae5504d9f1a95f75e64ce5f6c449c0..e9ba9c5a04572bf75156accad28f9e026ccf05f1 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -8,7 +8,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "clipbrd.h"
 #endif
 
 #pragma implementation "clipbrd.h"
 #endif
 


@@ -396,9 +396,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++)