X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e2c43b8551c394d790e416ae52a4476c759683e..4df78dc36e933fb1c3aa7c9d7ae2757a898ae05c:/src/gtk/clipbrd.cpp

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index f4ed88753f..d3cd53bc4e 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
 //-----------------------------------------------------------------------------
@@ -144,7 +153,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
         clipboard->m_waiting = FALSE;
         return;
     }
-    
+
     /* make sure we got the data in the correct form (selection type).
        if so, copy data to target object */
     
@@ -169,12 +178,16 @@ selection_received( GtkWidget *WXUNUSED(widget),
 	
 	case wxDF_BITMAP:
 	{
-            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP)
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
             {
                 clipboard->m_waiting = FALSE;
                 return;
             }
 	    
+	    wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object;
+	    
+	    bitmap_object->SetPngData( (const char*) selection_data->data, (size_t) selection_data->length );
+	    
 	    break;
 	}
 	
@@ -259,7 +272,7 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
     while (node)
     {
         wxDataObject *data_object = (wxDataObject *)node->Data();
-    
+	
 	if (data_object->GetFormat().GetAtom() != selection_data->target)
 	{
 	    node = node->Next();
@@ -294,10 +307,17 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
 	    
 	    case wxDF_BITMAP:
 	    {
-	        // wxBitmapDataObject *private_object = (wxBitmapDataObject*) data_object;
+	        wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data_object;
 	    
-		// how do we do that ?
-		
+	        if (bitmap_object->GetSize() == 0) return;
+	    
+                gtk_selection_data_set( 
+                    selection_data, 
+		    GDK_SELECTION_TYPE_STRING, 
+		    8*sizeof(gchar), 
+		    (unsigned char*) bitmap_object->GetData(), 
+		    (int) bitmap_object->GetSize() );
+		    
 		break;
 	    }
 	    
@@ -386,9 +406,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;
@@ -412,6 +436,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;
@@ -494,11 +523,20 @@ bool wxClipboard::AddData( wxDataObject *data )
 			       (gpointer) NULL );
 #endif
 
+#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;
@@ -507,9 +545,18 @@ bool wxClipboard::AddData( wxDataObject *data )
                                   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;
 }