X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99c67c777b7d7a6f0ea74823bff7b9c40379b5fa..a3e7d24d21f5371c88caffe4a85c8e4a5362db3f:/src/gtk1/clipbrd.cpp

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index d7812a880f..9a9e38ee22 100644
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -13,13 +13,29 @@
 
 #include "wx/clipbrd.h"
 
+#if wxUSE_CLIPBOARD
+
+#include "wx/utils.h"
+
+#include "glib.h"
+#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
 //-----------------------------------------------------------------------------
 
 wxClipboard *wxTheClipboard = (wxClipboard*) NULL;
 
-GdkAtom  g_textAtom        = 0;
 GdkAtom  g_clipboardAtom   = 0;
 GdkAtom  g_targetsAtom     = 0;
 
@@ -55,28 +71,49 @@ struct _GtkSelectionData
 static void
 targets_selection_received( GtkWidget *WXUNUSED(widget), 
                             GtkSelectionData *selection_data, 
+#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;
+    }
   
-  // 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++)
-  {
-     if (atoms[i] == clipboard->m_targetRequested)
-     {
-       clipboard->m_formatSupported = TRUE;
-       return;
-     }
-  }
-
-  return;
+    // 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)
+        {
+            clipboard->m_waiting = FALSE;
+            clipboard->m_formatSupported = TRUE;
+            return;
+        }
+    }
+
+    clipboard->m_waiting = FALSE;
+    return;
 }
 
 //-----------------------------------------------------------------------------
@@ -86,22 +123,99 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 static void 
 selection_received( GtkWidget *WXUNUSED(widget), 
                     GtkSelectionData *selection_data, 
+#if (GTK_MINOR_VERSION > 0)
+                    guint32 WXUNUSED(time),
+#endif
 		    wxClipboard *clipboard )
 {
-  if (!wxTheClipboard) return;
-  
-  if (selection_data->length <= 0) return;
-  
-  size_t size = (size_t) selection_data->length;
-  
-  // make sure we got the data in the correct form 
-  if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
-  
-  clipboard->m_receivedSize = size;
+    if (!wxTheClipboard)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
   
-  clipboard->m_receivedData = new char[size+1];
+    wxDataObject *data_object = clipboard->m_receivedData;
+
+    if (!data_object)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
+    
+    if (selection_data->length <= 0)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
   
-  memcpy( clipboard->m_receivedData, selection_data->data, size);  
+    /* make sure we got the data in the correct format */
+    if (data_object->GetFormat() != selection_data->target)
+    {
+        clipboard->m_waiting = FALSE;
+        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())
+    {
+        case wxDF_TEXT:
+	{
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                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_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }
+	    
+	    wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object;
+	    
+	    bitmap_object->SetPngData( (const void*) selection_data->data, (size_t) selection_data->length );
+	    
+	    break;
+	}
+	
+	case wxDF_PRIVATE:
+	{
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }
+	    
+	    wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object;
+	    
+	    private_object->SetData( (const char*) selection_data->data, (size_t) selection_data->length );
+	    
+	    break;
+	}
+	
+	default:
+	{
+            clipboard->m_waiting = FALSE;
+	    return;
+	}
+    }
+    
+    wxTheClipboard->m_formatSupported = TRUE;
+    clipboard->m_waiting = FALSE;
 }
 
 //-----------------------------------------------------------------------------
@@ -109,16 +223,38 @@ selection_received( GtkWidget *WXUNUSED(widget),
 //-----------------------------------------------------------------------------
 
 static gint
-selection_clear( GtkWidget *WXUNUSED(widget), GdkEventSelection *WXUNUSED(event) )
+selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 {
-  if (!wxTheClipboard) return TRUE;
-  
-  /* the clipboard is no longer in our hands. we can delete the
-   * clipboard data. I hope I got that one right... */
+    if (!wxTheClipboard) return TRUE;
+    
+    if (event->selection == GDK_SELECTION_PRIMARY)
+    {
+        wxTheClipboard->m_ownsPrimarySelection = FALSE;
+    }
+    else
+    if (event->selection == g_clipboardAtom)
+    {
+        wxTheClipboard->m_ownsClipboard = FALSE;
+    }
+    else
+    {
+        wxTheClipboard->m_waiting = FALSE;
+        return FALSE;
+    }
     
-  wxTheClipboard->SetData( (wxDataObject*) NULL );
+    if ((!wxTheClipboard->m_ownsPrimarySelection) &&
+        (!wxTheClipboard->m_ownsClipboard))
+    {
+        /* the clipboard is no longer in our hands. we can the delete clipboard data. */
+        if (wxTheClipboard->m_data)
+	{
+	    delete wxTheClipboard->m_data;
+	    wxTheClipboard->m_data = (wxDataObject*) NULL;
+	}
+    }
   
-  return TRUE;
+    wxTheClipboard->m_waiting = FALSE;
+    return TRUE;
 }
 
 //-----------------------------------------------------------------------------
@@ -128,33 +264,66 @@ selection_clear( GtkWidget *WXUNUSED(widget), GdkEventSelection *WXUNUSED(event)
 static void
 selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data, gpointer WXUNUSED(data) )
 {
-  if (!wxTheClipboard) return;
+    if (!wxTheClipboard) return;
   
-  wxDataObject *data_object = wxTheClipboard->m_data;
+    if (!wxTheClipboard->m_data) return;
   
-  if (!data_object) return;
+    wxDataObject *data = wxTheClipboard->m_data;
+    
+    if (!data->IsSupportedFormat( selection_data->target )) return;
   
-  if (data_object->GetDataSize() == 0) return;
+    if (data->GetFormat().GetType() == wxDF_TEXT)
+    {
+	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;
+    }
+
+    if (data->GetFormat().GetType() == wxDF_BITMAP)
+    {
+	wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data;
+	    
+	if (bitmap_object->GetDataSize(wxDF_BITMAP) == 0) return;
+	    
+        gtk_selection_data_set( 
+            selection_data, 
+	    GDK_SELECTION_TYPE_STRING, 
+	    8*sizeof(gchar), 
+	    (unsigned char*) bitmap_object->GetData(), 
+	    (int) bitmap_object->GetDataSize(wxDF_BITMAP) );
+	    
+	return;
+    }
+
+    int size = data->GetDataSize( selection_data->target );
+    
+    if (size == 0) return;
+    
+    char *d = new char[size];
+    
+    data->GetDataHere( selection_data->target, (void*) d );
 
-  
-  
-  gint len = data_object->GetDataSize();
-  guchar *bin_data = (guchar*) malloc( len );
-  data_object->GetDataHere( (void*)bin_data );
-  
-  if (selection_data->target == GDK_TARGET_STRING)
-  {
-    gtk_selection_data_set( 
-      selection_data, GDK_SELECTION_TYPE_STRING, 8*sizeof(gchar), bin_data, len );
-  }
-/*
-  else if (selection_data->target == g_textAtom)
-  {
     gtk_selection_data_set( 
-      selection_data, g_textAtom, 8*sizeof(gchar), bin_data, len );
-  }
-*/
-  free( bin_data );
+        selection_data, 
+	GDK_SELECTION_TYPE_STRING, 
+	8*sizeof(gchar), 
+	(unsigned char*) d,
+	size ); 
 }
 
 //-----------------------------------------------------------------------------
@@ -165,185 +334,297 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 
 wxClipboard::wxClipboard()
 {
-  m_data = (wxDataObject*) NULL;
-  
-  m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
-  gtk_widget_realize( m_clipboardWidget );
+    m_open = FALSE;
+
+    m_ownsClipboard = FALSE;
+    m_ownsPrimarySelection = FALSE;
+
+    m_data = (wxDataObject*) NULL;
+    m_receivedData = (wxDataObject*) NULL;
 
-  gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
-                      "selection_clear_event",
-		      GTK_SIGNAL_FUNC( selection_clear ), 
-		      (gpointer) 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 );
+
+    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_FUNC( selection_clear_clip ), 
+		        (gpointer) NULL );
 		      
-  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);
+    if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
+    if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
   
-  m_receivedData = (char*)NULL;
-  m_receivedSize = 0;
-  m_formatSupported = FALSE;
-  m_targetRequested = 0;
+    m_formatSupported = FALSE;
+    m_targetRequested = 0;
+    
+    m_usePrimary = FALSE;
 }
 
 wxClipboard::~wxClipboard()
 {
-  Clear();  
+    Clear();  
   
-  if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
+    if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
+    if (m_targetsWidget) gtk_widget_destroy( m_targetsWidget );
 }
 
 void wxClipboard::Clear()
 {
-  /* 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 (m_data)
-  { 
-    if (gdk_selection_owner_get( g_clipboardAtom) == m_clipboardWidget->window)
+    if (m_data)
     {
-        gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, GDK_CURRENT_TIME );
-    }
+#if wxUSE_THREADS
+        /* disable GUI threads */
+        wxapp_uninstall_thread_wakeup();
+#endif
     
-    delete m_data;
-    m_data = (wxDataObject*) NULL;
-  }
-  
-  m_receivedSize = 0;
-  
-  if (m_receivedData)
-  {
-    delete[] m_receivedData;
-    m_receivedData = (char*) NULL;
-  }
-  
-  m_targetRequested = 0;
+        /*  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;
+	    
+            gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, GDK_CURRENT_TIME );
+	    
+            while (m_waiting) gtk_main_iteration();
+        }
+    
+        if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
+        {
+            m_waiting = TRUE;
+	    
+            gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
+	    
+            while (m_waiting) gtk_main_iteration();
+        }
+    
+        if (m_data)
+        { 
+	    delete m_data;
+	    m_data = (wxDataObject*) NULL;
+	}
+	
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif
+    }
   
-  m_formatSupported = FALSE;
+    m_targetRequested = 0;
+    m_formatSupported = FALSE;
 }
 
-void wxClipboard::SetData( wxDataObject *data )
+bool wxClipboard::Open()
 {
-  Clear();
+    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
   
-/*
-   GTK 1.0.X cannot remove a target from a widget so if a widget
-   at first offers text and then a bitmap (and no longer text) to 
-   the clipboard, we seem too have to delete it.
-*/
+    m_open = TRUE;
+    
+    return TRUE;
+}
 
-  if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
+bool wxClipboard::SetData( wxDataObject *data )
+{
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
   
-  m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
-  gtk_widget_realize( m_clipboardWidget );
-
-  if (m_data) delete m_data;
-  m_data = data;
-  if (!m_data) return;
- 
-  if (!gtk_selection_owner_set( m_clipboardWidget, 
-                                g_clipboardAtom,
-				GDK_CURRENT_TIME))
-  {
-    delete m_data;
-    m_data = (wxDataObject*) NULL;
-    return;
-  }
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
   
-  switch (m_data->GetPreferredFormat())
-  {
-    case wxDF_TEXT:
-      gtk_selection_add_handler( m_clipboardWidget, 
-                                 g_clipboardAtom, 
-				// g_textAtom,
-				 GDK_TARGET_STRING,
-				 selection_handler,
-				 NULL );
-      break;
-    default:
-      break;
-  }
+    Clear();
+
+    return AddData( data );
 }
 
-bool wxClipboard::IsSupportedFormat( wxDataFormat format )
+bool wxClipboard::AddData( wxDataObject *data )
 {
-  m_targetRequested = 0;
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
   
-  if (format == wxDF_TEXT)
-  {
-//     m_targetRequested = g_textAtom;
-     m_targetRequested = GDK_TARGET_STRING;
-  }
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    
+    // we can only store one wxDataObject
+    Clear();
   
-  if (m_targetRequested == 0) return FALSE;
+    m_data = data;
 
-  gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
-                      "selection_received",
-		      GTK_SIGNAL_FUNC( targets_selection_received ), 
-		      (gpointer) this );
-  
-  m_formatSupported = FALSE;
-  
-  gtk_selection_convert( m_clipboardWidget,
-			 g_clipboardAtom, 
-			 g_targetsAtom,
-			 GDK_CURRENT_TIME );
-
-  gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget), 
-		                 GTK_SIGNAL_FUNC( targets_selection_received ),
-		                 (gpointer) this );
-  
-  if (!m_formatSupported) return FALSE;
-  
-  return TRUE;
+    /* get native format id of new data object */
+    GdkAtom format = data->GetFormat();
+	
+    wxCHECK_MSG( format, FALSE, wxT("data has invalid format") );
+    
+    /* This should happen automatically, but to be on the safe side */
+    m_ownsClipboard = FALSE;
+    m_ownsPrimarySelection = FALSE;
+    
+    /* Add handlers if someone requests data */
+
+#if (GTK_MINOR_VERSION > 0)
+
+    gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), 
+                              GDK_SELECTION_PRIMARY,
+			      format, 
+			      0 );  /* what is info ? */
+			     
+    gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), 
+                              g_clipboardAtom,
+			      format, 
+			      0 );  /* what is info ? */
+			     
+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
+                        "selection_get",
+		        GTK_SIGNAL_FUNC(selection_handler), 
+		        (gpointer) NULL );
+
+#else
+
+    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 );
+#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;
+    
+    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;
 }
 
-bool wxClipboard::ObtainData( wxDataFormat format )
+void wxClipboard::Close()
 {
-  m_receivedSize = 0;
-  
-  if (m_receivedData)
-  {
-    delete[] m_receivedData;
-    m_receivedData = (char*) NULL;
-  }
-  
-  m_targetRequested = 0;
+    wxCHECK_RET( m_open, wxT("clipboard not open") );
+    
+    m_open = FALSE;
+}
+
+bool wxClipboard::IsSupported( wxDataFormat format )
+{
+    /* store requested format to be asked for by callbacks */
+    
+    m_targetRequested = format;
   
-  if (format == wxDF_TEXT)
-  {
-//     m_targetRequested = g_textAtom;
-     m_targetRequested = GDK_TARGET_STRING;
-  }
+    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+    
+    m_formatSupported = FALSE;
   
-  if (m_targetRequested == 0) return FALSE;
+    /* perform query. this will set m_formatSupported to 
+       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_connect( GTK_OBJECT(m_clipboardWidget), 
-                      "selection_received",
-		      GTK_SIGNAL_FUNC( selection_received ), 
-		      (gpointer) this );
+    m_waiting = TRUE;
 
-  gtk_selection_convert( m_clipboardWidget,
-			 g_clipboardAtom, 
-			 m_targetRequested,
-			 GDK_CURRENT_TIME );
+    gtk_selection_convert( m_targetsWidget,
+			   m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, 
+			   g_targetsAtom,
+			   GDK_CURRENT_TIME );
+
+    while (m_waiting) gtk_main_iteration();
+    
+    if (!m_formatSupported) return FALSE;
+    
+    return TRUE;
+}    
+    
+bool wxClipboard::GetData( wxDataObject *data )
+{
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    
+    /* is data supported by clipboard ? */
+    
+    if (!IsSupported( data->GetFormat() )) return FALSE;
+    
+    /* 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 = data->GetFormat();
   
-  gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget), 
-		                 GTK_SIGNAL_FUNC( selection_received ),
-		                 (gpointer) this );
+    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
     
-  if (m_receivedSize == 0) return FALSE;
+    /* start query */
+    
+    m_formatSupported = FALSE;
   
-  return TRUE;
-}
+    /* 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 */
 
-size_t wxClipboard::GetDataSize() const
-{
-  return m_receivedSize;
-}
+    m_waiting = TRUE;
 
-void wxClipboard::GetDataHere( void *data ) const
-{
-  memcpy(data, m_receivedData, m_receivedSize );
+    gtk_selection_convert( m_clipboardWidget,
+			   m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, 
+			   m_targetRequested,
+			   GDK_CURRENT_TIME );
+  
+    while (m_waiting) gtk_main_iteration();
+
+    /* 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 TRUE;
 }
 
 //-----------------------------------------------------------------------------
@@ -354,13 +635,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
 
 bool wxClipboardModule::OnInit()
 {
-  wxTheClipboard = new wxClipboard();
+    wxTheClipboard = new wxClipboard();
   
-  return TRUE;
+    return TRUE;
 }
 
 void wxClipboardModule::OnExit()
 {
-  if (wxTheClipboard) delete wxTheClipboard;
-  wxTheClipboard = (wxClipboard*) NULL;
+    if (wxTheClipboard) delete wxTheClipboard;
+    wxTheClipboard = (wxClipboard*) NULL;
 }
+
+#endif
+
+  // wxUSE_CLIPBOARD
+