Small changes

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

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 9d6511d58bea87b711c5c33ace2c3497534a259e..229cfd3e13d5acc162d74ca0e99c19893ad9fb38 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -15,17 +15,27 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

+#include "wx/dataobj.h"
+#include "wx/utils.h"
+#include "wx/log.h"
+

 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------

-// data
+// thread system

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-wxClipboard *wxTheClipboard = (wxClipboard*) NULL;
+#if wxUSE_THREADS
+extern void wxapp_install_thread_wakeup();
+extern void wxapp_uninstall_thread_wakeup();
+#endif
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------

 
 

-GdkAtom  g_textAtom        = 0;

 GdkAtom  g_clipboardAtom   = 0;
 GdkAtom  g_targetsAtom     = 0;
 
 GdkAtom  g_clipboardAtom   = 0;
 GdkAtom  g_targetsAtom     = 0;
 


@@ -47,9 +57,9 @@ struct _GtkSelectionData
   GdkAtom selection;
   GdkAtom target;
   GdkAtom type;
   GdkAtom selection;
   GdkAtom target;
   GdkAtom type;

-  gint   format;
+  gint          format;

   guchar *data;
   guchar *data;

-  gint   length;
+  gint          length;

 };
 
 */
 };
 
 */


@@ -61,30 +71,55 @@ struct _GtkSelectionData
 static void
 targets_selection_received( GtkWidget *WXUNUSED(widget), 
                             GtkSelectionData *selection_data, 
 static void
 targets_selection_received( GtkWidget *WXUNUSED(widget), 
                             GtkSelectionData *selection_data, 

-                           wxClipboard *clipboard )
+#if (GTK_MINOR_VERSION > 0)
+                            guint32 WXUNUSED(time),
+#endif
+                            wxClipboard *clipboard )

 {
 {

-    if (!wxTheClipboard) return;
-  
-    if (selection_data->length <= 0) return;
+    if (!wxTheClipboard)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }

   
   

-    // make sure we got the data in the correct form 
-    if (selection_data->type != GDK_SELECTION_TYPE_ATOM) return;
+    if (selection_data->length <= 0)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
+    
+    /* make sure we got the data in the correct form */
+    if (selection_data->type != GDK_SELECTION_TYPE_ATOM)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
+    
+/*
+    wxDataFormat clip( selection_data->selection );
+    wxLogDebug( wxT("selection received for targets, clipboard %s"), clip.GetId().c_str() );
+*/

   
     // the atoms we received, holding a list of targets (= formats) 
     GdkAtom *atoms = (GdkAtom *)selection_data->data;
 
     for (unsigned int i=0; i<selection_data->length/sizeof(GdkAtom); i++)
     {
   
     // the atoms we received, holding a list of targets (= formats) 
     GdkAtom *atoms = (GdkAtom *)selection_data->data;
 
     for (unsigned int i=0; i<selection_data->length/sizeof(GdkAtom); i++)
     {

-      char *name = gdk_atom_name (atoms[i]);
-      if (name) printf( "Format available: %s.\n", name );
-      
-        if (atoms[i] == clipboard->m_targetRequested)
+        wxDataFormat format( atoms[i] );
+       
+/*
+       wxLogDebug( wxT("selection received for targets, format %s"), format.GetId().c_str() );
+*/
+
+        if (format == clipboard->m_targetRequested)

         {
         {

+            clipboard->m_waiting = FALSE;

             clipboard->m_formatSupported = TRUE;
             return;
         }
     }
 
             clipboard->m_formatSupported = TRUE;
             return;
         }
     }
 

+    clipboard->m_waiting = FALSE;

     return;
 }
 
     return;
 }
 


@@ -95,65 +130,52 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 static void 
 selection_received( GtkWidget *WXUNUSED(widget), 
                     GtkSelectionData *selection_data, 
 static void 
 selection_received( GtkWidget *WXUNUSED(widget), 
                     GtkSelectionData *selection_data, 

-                   wxClipboard *clipboard )
+#if (GTK_MINOR_VERSION > 0)
+                    guint32 WXUNUSED(time),
+#endif
+                    wxClipboard *clipboard )

 {
 {

-    if (!wxTheClipboard) return;
+    if (!wxTheClipboard)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }

   
     wxDataObject *data_object = clipboard->m_receivedData;
   
     wxDataObject *data_object = clipboard->m_receivedData;

+
+    if (!data_object)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }

     
     

-    if (!data_object) return;
+    if (selection_data->length <= 0)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }

     
     

-    if (selection_data->length <= 0) return;
+    wxDataFormat format( selection_data->target );

   
   

-    // make sure we got the data in the correct format
-    
-    if (data_object->GetFormat().GetAtom() != selection_data->target) return;
-    
-    // make sure we got the data in the correct form (selection type).
-    // if so, copy data to target object
-    
-    switch (data_object->GetFormat().GetType())
+    /* make sure we got the data in the correct format */
+    if (!data_object->IsSupportedFormat( format ) )

     {
     {

-        case wxDF_TEXT:
-       {
-            if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
-           
-           wxTextDataObject *text_object = (wxTextDataObject *) data_object;
-           
-           wxString text = (const char*) selection_data->data;
-           
-           text_object->SetText( text );
-           
-           break;
-       }
-       
-       case wxDF_BITMAP:
-       {
-            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP) return;
-           
-           return;
-           
-           break;
-       }
-       
-       case wxDF_PRIVATE:
-       {
-            if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
-           
-           wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object;
-           
-           private_object->SetData( (const char*) selection_data->data, (size_t) selection_data->length );
-           
-           break;
-       }
-       
-       default:
-       {
-           return;
-       }
+        clipboard->m_waiting = FALSE;
+        return;

     }
     }

+
+    /* make sure we got the data in the correct form (selection type).
+       if so, copy data to target object */
+    if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
+            
+    data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );

     
     wxTheClipboard->m_formatSupported = TRUE;
     
     wxTheClipboard->m_formatSupported = TRUE;

+    clipboard->m_waiting = FALSE;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -176,21 +198,24 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
     }
     else
     {
     }
     else
     {

+        wxTheClipboard->m_waiting = FALSE;

         return FALSE;
     }
     
     if ((!wxTheClipboard->m_ownsPrimarySelection) &&
         (!wxTheClipboard->m_ownsClipboard))
     {
         return FALSE;
     }
     
     if ((!wxTheClipboard->m_ownsPrimarySelection) &&
         (!wxTheClipboard->m_ownsClipboard))
     {

-        /* the clipboard is no longer in our hands. we can the  clipboard data. */
-      
-        if (wxTheClipboard->m_dataBroker)
-       {
-           delete wxTheClipboard->m_dataBroker;
-           wxTheClipboard->m_dataBroker = (wxDataBroker*) NULL;
-       }
+        /* the clipboard is no longer in our hands. we can the delete clipboard data. */
+        if (wxTheClipboard->m_data)
+        {
+           wxLogDebug( wxT("wxClipboard will get cleared" ) );
+           
+            delete wxTheClipboard->m_data;
+            wxTheClipboard->m_data = (wxDataObject*) NULL;
+        }

     }
   
     }
   

+    wxTheClipboard->m_waiting = FALSE;

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -203,70 +228,51 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
 {
     if (!wxTheClipboard) return;
   
 {
     if (!wxTheClipboard) return;
   

-    if (!wxTheClipboard->m_dataBroker) return;
+    if (!wxTheClipboard->m_data) return;

   
   

-    wxNode *node = wxTheClipboard->m_dataBroker->m_dataObjects.First();
+    wxDataObject *data = wxTheClipboard->m_data;

     
     

-    while (node)
+    wxDataFormat format( selection_data->target );
+
+    if (!data->IsSupportedFormat( format )) return;
+  
+    /* this will fail for composite formats */
+    if (format.GetType() == wxDF_TEXT)

     {
     {

-        wxDataObject *data_object = (wxDataObject *)node->Data();
-    
-       if (data_object->GetFormat().GetAtom() != selection_data->target)
-       {
-           node = node->Next();
-           break;
-       }
-       
-       switch (data_object->GetFormat().GetType())
-       {
-           case wxDF_TEXT:
-           {
-               wxTextDataObject *text_object = (wxTextDataObject*) data_object;
-           
-               wxString text = text_object->GetText();
-           
-               char *s = WXSTRINGCAST text;
-               int len = (int) text.Length();
-               
-                gtk_selection_data_set( 
-                    selection_data, 
-                   GDK_SELECTION_TYPE_STRING, 
-                   8*sizeof(gchar),
-                   (unsigned char*) s, 
-                   len ); 
-                   
-               break;
-           }
-           
-           case wxDF_BITMAP:
-           {
-               // wxBitmapDataObject *private_object = (wxBitmapDataObject*) data_object;
-           
-               // how do we do that ?
-               
-               break;
-           }
-           
-           case wxDF_PRIVATE:
-            {
-               wxPrivateDataObject *private_object = (wxPrivateDataObject*) data_object;
-           
-               if (private_object->GetSize() == 0) return;
-           
-                gtk_selection_data_set( 
-                    selection_data, 
-                   GDK_SELECTION_TYPE_STRING, 
-                   8*sizeof(gchar), 
-                   (unsigned char*) private_object->GetData(), 
-                   (int) private_object->GetSize() );
-           }
-           
-           default:
-             break;
-        }
-       
-       node = node->Next();
+        wxTextDataObject *text_object = (wxTextDataObject*) data;
+        wxString text( text_object->GetText() );
+
+#if wxUSE_UNICODE
+        const wxWX2MBbuf s = text.mbc_str();
+        int len = strlen(s);
+#else // more efficient in non-Unicode
+        const char *s = text.c_str();
+        int len = (int) text.Length();
+#endif
+        gtk_selection_data_set( 
+            selection_data, 
+            GDK_SELECTION_TYPE_STRING, 
+            8*sizeof(gchar),
+            (unsigned char*) (const char*) s,
+            len ); 
+                    
+        return;

     }
     }

+
+    int size = data->GetDataSize( format );
+    
+    if (size == 0) return;
+    
+    char *d = new char[size];
+    
+    data->GetDataHere( selection_data->target, (void*) d );
+
+    gtk_selection_data_set( 
+        selection_data, 
+        GDK_SELECTION_TYPE_STRING, 
+        8*sizeof(gchar), 
+        (unsigned char*) d,
+        size ); 

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -282,24 +288,41 @@ wxClipboard::wxClipboard()
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
 
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
 

-    m_dataBroker = (wxDataBroker*) NULL;
-  
+    m_data = (wxDataObject*) NULL;

     m_receivedData = (wxDataObject*) NULL;
 
     m_receivedData = (wxDataObject*) NULL;
 

+    /* we use m_targetsWidget to query what formats are available */
+    
+    m_targetsWidget = gtk_window_new( GTK_WINDOW_POPUP );
+    gtk_widget_realize( m_targetsWidget );
+
+    gtk_signal_connect( GTK_OBJECT(m_targetsWidget), 
+                        "selection_received",
+                        GTK_SIGNAL_FUNC( targets_selection_received ), 
+                        (gpointer) this );
+                        
+    /* we use m_clipboardWidget to get and to offer data */
+    

     m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_clipboardWidget );
 
     m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_clipboardWidget );
 

+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
+                        "selection_received",
+                        GTK_SIGNAL_FUNC( selection_received ), 
+                        (gpointer) this );
+

     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_clear_event",
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_clear_event",

-                       GTK_SIGNAL_FUNC( selection_clear_clip ), 
-                       (gpointer) NULL );
-                     
+                        GTK_SIGNAL_FUNC( selection_clear_clip ), 
+                        (gpointer) NULL );
+                      

     if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
     if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );

-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "TEXT", FALSE );

     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
   
     m_formatSupported = FALSE;
     m_targetRequested = 0;
     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
   
     m_formatSupported = FALSE;
     m_targetRequested = 0;

+    
+    m_usePrimary = FALSE;

 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()


@@ -307,51 +330,70 @@ wxClipboard::~wxClipboard()
     Clear();  
   
     if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
     Clear();  
   
     if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );

+    if (m_targetsWidget) gtk_widget_destroy( m_targetsWidget );

 }
 
 void wxClipboard::Clear()
 {
 }
 
 void wxClipboard::Clear()
 {

-    if (m_dataBroker)
-    { 
+    if (m_data)
+    {
+#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 */
         /*  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)
         {
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {

-            gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, GDK_CURRENT_TIME );
+            m_waiting = TRUE;
+            
+            gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
+                                     (guint32) GDK_CURRENT_TIME );
+            
+            while (m_waiting) gtk_main_iteration();

         }
     
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {
         }
     
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {

-            gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
+            m_waiting = TRUE;
+            
+            gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
+                                     (guint32) GDK_CURRENT_TIME );
+            
+            while (m_waiting) gtk_main_iteration();

         }
     
         }
     

-        if (m_dataBroker)
-       {
-           delete m_dataBroker;
-           m_dataBroker = (wxDataBroker*) NULL;
-       }
+        if (m_data)
+        { 
+            delete m_data;
+            m_data = (wxDataObject*) NULL;
+        }
+        
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif

     }
   
     m_targetRequested = 0;
     }
   
     m_targetRequested = 0;

-  

     m_formatSupported = FALSE;
 }
 
 bool wxClipboard::Open()
 {
     m_formatSupported = FALSE;
 }
 
 bool wxClipboard::Open()
 {

-    wxCHECK_MSG( !m_open, FALSE, "clipboard already open" );
+    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );

   
     m_open = TRUE;
   
     m_open = TRUE;

-  
+    

     return TRUE;
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
     return TRUE;
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );

   
   

-    wxCHECK_MSG( data, FALSE, "data is invalid" );
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );

   
     Clear();
 
   
     Clear();
 


@@ -360,172 +402,201 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );

   
   

-    wxCHECK_MSG( data, FALSE, "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();
-  
-    /* add new data to list of offered data objects */
+    /* we can only store one wxDataObject */
+    Clear();

   
   

-    m_dataBroker->Add( data );
-    
-    /* get native format id of new data object */
-    
-    GdkAtom format = data->GetFormat().GetAtom();
-       
-    wxCHECK_MSG( format, FALSE, "data has invalid format" );
-    
-    /* This should happen automatically, but to be on the safe side */
-      
-    m_ownsClipboard = FALSE;
-    m_ownsPrimarySelection = FALSE;
+    m_data = data;
+
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+
+    /* primary selection or clipboard */
+    GdkAtom clipboard = m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                     : g_clipboardAtom;
+

     
     

-    /* Add handlers if someone requests data */
-  
-    gtk_selection_add_handler( m_clipboardWidget, 
-                               g_clipboardAtom,
-                              format,
-                              selection_handler,
-                              (gpointer) NULL );
-                              
-    gtk_selection_add_handler( m_clipboardWidget, 
-                               GDK_SELECTION_PRIMARY,
-                              format,
-                              selection_handler,
-                              (gpointer) NULL );
-                              
-    /* Tell the world we offer clipboard data */
-  
-    if (!gtk_selection_owner_set( m_clipboardWidget, 
-                                  g_clipboardAtom,
-                                 GDK_CURRENT_TIME ))
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)

     {
     {

-        return FALSE;
+        wxLogDebug( wxT("wxClipboard now supports atom %s"), array[i].GetId().c_str() );
+
+        gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget),
+                                 clipboard,
+                                  array[i], 
+                                  0 );  /* what is info ? */

     }
     }

-    m_ownsClipboard = TRUE;
+
+    delete[] array;
+                             
+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
+                        "selection_get",
+                        GTK_SIGNAL_FUNC(selection_handler), 
+                        (gpointer) NULL );
+
+#if wxUSE_THREADS
+    /* disable GUI threads */
+    wxapp_uninstall_thread_wakeup();
+#endif

     
     

-    if (!gtk_selection_owner_set( m_clipboardWidget, 
-                                  GDK_SELECTION_PRIMARY,
-                                 GDK_CURRENT_TIME ))
-    {  
-        return FALSE;
-    }
-    m_ownsPrimarySelection = TRUE;
-       
-    return TRUE;
+    /* Tell the world we offer clipboard data */
+    bool res = (gtk_selection_owner_set( m_clipboardWidget,
+                                         clipboard,
+                                         (guint32) GDK_CURRENT_TIME ));
+    
+    if (m_usePrimary)
+        m_ownsPrimarySelection = res;
+    else
+        m_ownsClipboard = res;
+    
+#if wxUSE_THREADS
+    /* re-enable GUI threads */
+    wxapp_install_thread_wakeup();
+#endif
+        
+    return res;

 }
 
 void wxClipboard::Close()
 {
 }
 
 void wxClipboard::Close()
 {

-    wxCHECK_RET( m_open, "clipboard not open" );
+    wxCHECK_RET( m_open, wxT("clipboard not open") );

     
     m_open = FALSE;
 }
 
     
     m_open = FALSE;
 }
 

-bool wxClipboard::IsSupported( wxDataFormat format )
+bool wxClipboard::IsOpened() const
+{
+    return m_open;
+}
+
+bool wxClipboard::IsSupported( const wxDataFormat& format )

 {
 {

-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    /* reentrance problems */
+    if (m_open) return TRUE;

     
     /* store requested format to be asked for by callbacks */
     
     /* store requested format to be asked for by callbacks */

-    
-    m_targetRequested = format.GetAtom();
+    m_targetRequested = format;

   
   

-    wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
+    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );

     
     

-    /* add handler for target (= format) query */
-
-    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
-                        "selection_received",
-                       GTK_SIGNAL_FUNC( targets_selection_received ), 
-                       (gpointer) this );
-  

     m_formatSupported = FALSE;
   
     /* perform query. this will set m_formatSupported to 
     m_formatSupported = FALSE;
   
     /* perform query. this will set m_formatSupported to 

-     * TRUE if m_targetRequested is supported */
-    
-    gtk_selection_convert( m_clipboardWidget,
-                          g_clipboardAtom, 
-                          g_targetsAtom,
-                          GDK_CURRENT_TIME );
+       TRUE if m_targetRequested is supported.
+       alsom we have to wait for the "answer" from the 
+       clipboard owner which is an asynchronous process.
+       therefore we set m_waiting = TRUE here and wait
+       until the callback "targets_selection_received" 
+       sets it to FALSE */

 
 

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget), 
-                                  GTK_SIGNAL_FUNC( targets_selection_received ),
-                                  (gpointer) this );
-  
+    m_waiting = TRUE;
+
+    gtk_selection_convert( m_targetsWidget,
+                           m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                        : g_clipboardAtom, 
+                           g_targetsAtom,
+                           (guint32) GDK_CURRENT_TIME );
+
+    while (m_waiting) gtk_main_iteration();
+    

     if (!m_formatSupported) return FALSE;
     
     return TRUE;
 }    
     
     if (!m_formatSupported) return FALSE;
     
     return TRUE;
 }    
     

-bool wxClipboard::GetData( wxDataObject *data )
+bool wxClipboard::GetData( wxDataObject& data )

 {
 {

-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );

     
     

-    /* is data supported by clipboard ? */
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];
+    data.GetAllFormats( array );

     
     

-    if (!IsSupported( data->GetFormat() )) return FALSE;
-    
-    /* store pointer to data object to be filled up by callbacks */
+    for (size_t i = 0; i < data.GetFormatCount(); i++)
+    {
+        wxDataFormat format( array[i] );

     
     

-    m_receivedData = data;
+        wxLogDebug( wxT("wxClipboard::GetData: requested format: %s"), format.GetId().c_str() );

     
     

-    /* store requested format to be asked for by callbacks */
-    
-    m_targetRequested = data->GetFormat().GetAtom();
+        /* is data supported by clipboard ? */
+       
+        /* store requested format to be asked for by callbacks */
+        m_targetRequested = format;

   
   

-    wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
+        wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );

     
     

-    /* start query */
-    
-    m_formatSupported = FALSE;
+        m_formatSupported = FALSE;

   
   

-    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
-                        "selection_received",
-                       GTK_SIGNAL_FUNC( selection_received ), 
-                       (gpointer) this );
-
-    /* ask for clipboard contents */
+       /* perform query. this will set m_formatSupported to 
+          TRUE if m_targetRequested is supported.
+          also, we have to wait for the "answer" from the 
+          clipboard owner which is an asynchronous process.
+          therefore we set m_waiting = TRUE here and wait
+          until the callback "targets_selection_received" 
+          sets it to FALSE */

 
 

-    gtk_selection_convert( m_clipboardWidget,
-                          g_clipboardAtom, 
-                          m_targetRequested,
-                          GDK_CURRENT_TIME );
-  
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget), 
-                                  GTK_SIGNAL_FUNC( selection_received ),
-                                  (gpointer) this );
+        m_waiting = TRUE;

 
 

-    /* this is a true error as we checked for the presence of such data before */
+        gtk_selection_convert( m_targetsWidget,
+                           m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                        : g_clipboardAtom, 
+                           g_targetsAtom,
+                           (guint32) GDK_CURRENT_TIME );

 
 

-    wxCHECK_MSG( m_formatSupported, FALSE, "error retrieving data from clipboard" );
+        while (m_waiting) gtk_main_iteration();
+    
+        if (!m_formatSupported) continue;
+    
+        /* store pointer to data object to be filled up by callbacks */
+        m_receivedData = &data;
+    
+        /* store requested format to be asked for by callbacks */
+        m_targetRequested = format;

   
   

-    return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// wxClipboardModule
-//-----------------------------------------------------------------------------
+        wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+    
+        /* start query */
+        m_formatSupported = FALSE;
+  
+        /* ask for clipboard contents.  this will set 
+           m_formatSupported to TRUE if m_targetRequested 
+           is supported.
+           also, we have to wait for the "answer" from the 
+           clipboard owner which is an asynchronous process.
+           therefore we set m_waiting = TRUE here and wait
+           until the callback "targets_selection_received" 
+           sets it to FALSE */

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
+        m_waiting = TRUE;

 
 

-bool wxClipboardModule::OnInit()
-{
-    wxTheClipboard = new wxClipboard();
+        wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
+    
+        gtk_selection_convert( m_clipboardWidget,
+                               m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                            : g_clipboardAtom, 
+                               m_targetRequested,
+                               (guint32) GDK_CURRENT_TIME );

   
   

-    return TRUE;
-}
+        while (m_waiting) gtk_main_iteration();

 
 

-void wxClipboardModule::OnExit()
-{
-    if (wxTheClipboard) delete wxTheClipboard;
-    wxTheClipboard = (wxClipboard*) NULL;
+        /* this is a true error as we checked for the presence of such data before */
+        wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") );
+        
+        /* return success */
+        delete[] array;
+        return TRUE;
+    }
+  
+    wxLogDebug( wxT("wxClipboard::GetData: format not found") );
+    
+    /* return failure */
+    delete[] array;
+    return FALSE;

 }
 
 #endif
 }
 
 #endif

-

   // wxUSE_CLIPBOARD
 
   // wxUSE_CLIPBOARD