X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b453e1b24bfa07074b29f1599a731c0c58d731b0..9abe166a3073d9e9ceb0110429a45adc6517d76f:/src/gtk1/clipbrd.cpp?ds=sidebyside

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 827e86ea22..d981a17e76 100644
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -153,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 */
     
@@ -178,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;
 	}
 	
@@ -268,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();
@@ -303,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;
 	    }
 	    
@@ -439,7 +450,7 @@ void wxClipboard::Clear()
 
 bool wxClipboard::Open()
 {
-    wxCHECK_MSG( !m_open, FALSE, _T("clipboard already open") );
+    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
   
     m_open = TRUE;
     
@@ -448,9 +459,9 @@ bool wxClipboard::Open()
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
-    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
   
-    wxCHECK_MSG( data, FALSE, _T("data is invalid") );
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
   
     Clear();
 
@@ -459,9 +470,9 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
-    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
   
-    wxCHECK_MSG( data, FALSE, _T("data is invalid") );
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
     
     /* if clipboard has been cleared before, create new data broker */
     if (!m_dataBroker) m_dataBroker = new wxDataBroker();
@@ -472,7 +483,7 @@ bool wxClipboard::AddData( wxDataObject *data )
     /* get native format id of new data object */
     GdkAtom format = data->GetFormat().GetAtom();
 	
-    wxCHECK_MSG( format, FALSE, _T("data has invalid format") );
+    wxCHECK_MSG( format, FALSE, wxT("data has invalid format") );
     
     /* This should happen automatically, but to be on the safe side */
     m_ownsClipboard = FALSE;
@@ -552,20 +563,20 @@ bool wxClipboard::AddData( wxDataObject *data )
 
 void wxClipboard::Close()
 {
-    wxCHECK_RET( m_open, _T("clipboard not open") );
+    wxCHECK_RET( m_open, wxT("clipboard not open") );
     
     m_open = FALSE;
 }
 
 bool wxClipboard::IsSupported( wxDataFormat format )
 {
-    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
     
     /* store requested format to be asked for by callbacks */
     
     m_targetRequested = format.GetAtom();
   
-    wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") );
+    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
     
     m_formatSupported = FALSE;
   
@@ -593,7 +604,7 @@ bool wxClipboard::IsSupported( wxDataFormat format )
     
 bool wxClipboard::GetData( wxDataObject *data )
 {
-    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
     
     /* is data supported by clipboard ? */
     
@@ -607,7 +618,7 @@ bool wxClipboard::GetData( wxDataObject *data )
     
     m_targetRequested = data->GetFormat().GetAtom();
   
-    wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") );
+    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
     
     /* start query */
     
@@ -633,7 +644,7 @@ bool wxClipboard::GetData( wxDataObject *data )
 
     /* this is a true error as we checked for the presence of such data before */
 
-    wxCHECK_MSG( m_formatSupported, FALSE, _T("error retrieving data from clipboard") );
+    wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") );
   
     return TRUE;
 }