X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db2d879ad4bdd492daee48bf2829760b92d8e50e..22d6efa851642c6a69174278fc50f712f41e2271:/src/gtk/clipbrd.cpp

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index a4bf7b6a6f..827e86ea22 100644
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -21,6 +21,15 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+//-----------------------------------------------------------------------------
+// thread system
+//-----------------------------------------------------------------------------
+
+#if wxUSE_THREADS
+extern void wxapp_install_thread_wakeup();
+extern void wxapp_uninstall_thread_wakeup();
+#endif
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -91,7 +100,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 
     for (unsigned int i=0; i<selection_data->length/sizeof(GdkAtom); i++)
     {
-/*      char *name = gdk_atom_name (atoms[i]);
+/*        char *name = gdk_atom_name (atoms[i]);
         if (name) printf( "Format available: %s.\n", name ); */
       
         if (atoms[i] == clipboard->m_targetRequested)
@@ -370,6 +379,8 @@ wxClipboard::wxClipboard()
   
     m_formatSupported = FALSE;
     m_targetRequested = 0;
+    
+    m_usePrimary = FALSE;
 }
 
 wxClipboard::~wxClipboard()
@@ -384,9 +395,13 @@ void wxClipboard::Clear()
 {
     if (m_dataBroker)
     { 
+#if wxUSE_THREADS
+        /* disable GUI threads */
+        wxapp_uninstall_thread_wakeup();
+#endif
+    
         /*  As we have data we also own the clipboard. Once we no longer own
             it, clear_selection is called which will set m_data to zero */
-     
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {
             m_waiting = TRUE;
@@ -410,6 +425,11 @@ void wxClipboard::Clear()
 	    delete m_dataBroker;
 	    m_dataBroker = (wxDataBroker*) NULL;
 	}
+	
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif
     }
   
     m_targetRequested = 0;
@@ -422,7 +442,7 @@ bool wxClipboard::Open()
     wxCHECK_MSG( !m_open, FALSE, _T("clipboard already open") );
   
     m_open = TRUE;
-  
+    
     return TRUE;
 }
 
@@ -492,27 +512,40 @@ bool wxClipboard::AddData( wxDataObject *data )
 			       (gpointer) NULL );
 #endif
 
-//    printf( "vorher.\n" );			       
+#if wxUSE_THREADS
+        /* disable GUI threads */
+        wxapp_uninstall_thread_wakeup();
+#endif
+    
     /* Tell the world we offer clipboard data */
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   g_clipboardAtom,
 				  GDK_CURRENT_TIME ))
     {
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif
         return FALSE;
     }
     m_ownsClipboard = TRUE;
     
-//    printf( "nachher.\n" );			       
-    
-    return TRUE;
-    
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   GDK_SELECTION_PRIMARY,
 				  GDK_CURRENT_TIME ))
     {  
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif
         return FALSE;
     }
     m_ownsPrimarySelection = TRUE;
+    
+#if wxUSE_THREADS
+    /* re-enable GUI threads */
+    wxapp_install_thread_wakeup();
+#endif
 	
     return TRUE;
 }
@@ -547,7 +580,7 @@ bool wxClipboard::IsSupported( wxDataFormat format )
     m_waiting = TRUE;
 
     gtk_selection_convert( m_targetsWidget,
-			   g_clipboardAtom, 
+			   m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, 
 			   g_targetsAtom,
 			   GDK_CURRENT_TIME );
 
@@ -592,7 +625,7 @@ bool wxClipboard::GetData( wxDataObject *data )
     m_waiting = TRUE;
 
     gtk_selection_convert( m_clipboardWidget,
-			   g_clipboardAtom, 
+			   m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, 
 			   m_targetRequested,
 			   GDK_CURRENT_TIME );