don't draw with NULL font

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

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index f4ed88753f79f52160ed65ed00ac8a455a5dca75..d981a17e766bb9227ca3871fc90f104f3f12c871 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/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;
@@ -421,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;
     
@@ -430,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();
 
@@ -441,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();
@@ -454,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;
@@ -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,29 +545,38 @@ 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;
 }
 
 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;
   
@@ -557,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 ? */
     
@@ -571,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 */
     
@@ -597,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;
 }