make sure we are comparing the stripped strings

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

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 9a9e38ee22da3402c478a7b057c1b7423e664fcc..6faf83eaadcda452f6d4bfd3edd6e6322b1beeef 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -1,50 +1,60 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipbrd.cpp
+// Name:        gtk/clipbrd.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "clipbrd.h"
 #endif
 
 #pragma implementation "clipbrd.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/clipbrd.h"
 
 #if wxUSE_CLIPBOARD
 
 #include "wx/clipbrd.h"
 
 #if wxUSE_CLIPBOARD
 

+#include "wx/dataobj.h"

 #include "wx/utils.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>

 
 //-----------------------------------------------------------------------------
 // thread system
 //-----------------------------------------------------------------------------
 
 #if wxUSE_THREADS
 
 //-----------------------------------------------------------------------------
 // thread system
 //-----------------------------------------------------------------------------
 
 #if wxUSE_THREADS

-extern void wxapp_install_thread_wakeup();
-extern void wxapp_uninstall_thread_wakeup();

 #endif
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 #endif
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 

-wxClipboard *wxTheClipboard = (wxClipboard*) NULL;
-

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

+#if defined(__WXGTK20__) && wxUSE_UNICODE
+extern GdkAtom g_altTextAtom;
+#endif
+
+// the trace mask we use with wxLogTrace() - call
+// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
+// (there will be a *lot* of them!)
+static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
+

 //-----------------------------------------------------------------------------
 // reminder
 //-----------------------------------------------------------------------------
 
 /* The contents of a selection are returned in a GtkSelectionData
 //-----------------------------------------------------------------------------
 // reminder
 //-----------------------------------------------------------------------------
 
 /* The contents of a selection are returned in a GtkSelectionData

-   structure. selection/target identify the request. 
+   structure. selection/target identify the request.

    type specifies the type of the return; if length < 0, and
    the data should be ignored. This structure has object semantics -
    no fields should be modified directly, they should not be created
    type specifies the type of the return; if length < 0, and
    the data should be ignored. This structure has object semantics -
    no fields should be modified directly, they should not be created


@@ -57,9 +67,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;

 };
 
 */
 };
 
 */


@@ -69,71 +79,77 @@ struct _GtkSelectionData
 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-targets_selection_received( GtkWidget *WXUNUSED(widget), 
-                            GtkSelectionData *selection_data, 
-#if (GTK_MINOR_VERSION > 0)
+targets_selection_received( GtkWidget *WXUNUSED(widget),
+                            GtkSelectionData *selection_data,

                             guint32 WXUNUSED(time),
                             guint32 WXUNUSED(time),

-#endif
-                           wxClipboard *clipboard )
+                            wxClipboard *clipboard )

 {
 {

-    if (!wxTheClipboard)
-    {
-        clipboard->m_waiting = FALSE;
-        return;
-    }
-  
-    if (selection_data->length <= 0)
+    if ( wxTheClipboard && 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;
+        // make sure we got the data in the correct form
+        GdkAtom type = selection_data->type;
+        if ( type != GDK_SELECTION_TYPE_ATOM )
+        {
+            if ( strcmp(gdk_atom_name(type), "TARGETS") )
+            {
+                wxLogTrace( TRACE_CLIPBOARD,
+                            _T("got unsupported clipboard target") );

 
 

-    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;
+                return;
+            }
+        }
+
+#ifdef __WXDEBUG__
+        wxDataFormat clip( selection_data->selection );
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("selection received for targets, clipboard %s"),
+                    clip.GetId().c_str() );
+#endif // __WXDEBUG__
+
+        // 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++)

         {
         {

-            clipboard->m_waiting = FALSE;
-            clipboard->m_formatSupported = TRUE;
-            return;
+            wxDataFormat format( atoms[i] );
+
+            wxLogTrace( TRACE_CLIPBOARD,
+                        wxT("selection received for targets, format %s"),
+                        format.GetId().c_str() );
+
+//            printf( "format %s requested %s\n", 
+//                    gdk_atom_name( atoms[i] ),
+//                    gdk_atom_name( clipboard->m_targetRequested ) );
+
+            if (format == clipboard->m_targetRequested)
+            {
+                clipboard->m_waiting = FALSE;
+                clipboard->m_formatSupported = TRUE;
+                return;
+            }

         }
     }
 
     clipboard->m_waiting = FALSE;
         }
     }
 
     clipboard->m_waiting = FALSE;

-    return;

 }
 
 //-----------------------------------------------------------------------------
 // "selection_received" for the actual data
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "selection_received" for the actual data
 //-----------------------------------------------------------------------------
 

-static void 
-selection_received( GtkWidget *WXUNUSED(widget), 
-                    GtkSelectionData *selection_data, 
-#if (GTK_MINOR_VERSION > 0)
+static void
+selection_received( GtkWidget *WXUNUSED(widget),
+                    GtkSelectionData *selection_data,

                     guint32 WXUNUSED(time),
                     guint32 WXUNUSED(time),

-#endif
-                   wxClipboard *clipboard )
+                    wxClipboard *clipboard )

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

-  
+

     wxDataObject *data_object = clipboard->m_receivedData;
 
     if (!data_object)
     wxDataObject *data_object = clipboard->m_receivedData;
 
     if (!data_object)


@@ -141,79 +157,35 @@ selection_received( GtkWidget *WXUNUSED(widget),
         clipboard->m_waiting = FALSE;
         return;
     }
         clipboard->m_waiting = FALSE;
         return;
     }

-    
+

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

-  
-    /* make sure we got the data in the correct format */
-    if (data_object->GetFormat() != selection_data->target)
+
+    wxDataFormat format( selection_data->target );
+
+    // make sure we got the data in the correct format
+    if (!data_object->IsSupportedFormat( format ) )

     {
         clipboard->m_waiting = FALSE;
         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 */
-    
-    switch (data_object->GetFormat().GetType())
+#if 0
+    This seems to cause problems somehow
+    // 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)

     {
     {

-        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;
-       }
+        clipboard->m_waiting = FALSE;
+        return;

     }
     }

-    
+#endif
+
+    data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
+

     wxTheClipboard->m_formatSupported = TRUE;
     clipboard->m_waiting = FALSE;
 }
     wxTheClipboard->m_formatSupported = TRUE;
     clipboard->m_waiting = FALSE;
 }


@@ -226,7 +198,7 @@ static gint
 selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 {
     if (!wxTheClipboard) return TRUE;
 selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 {
     if (!wxTheClipboard) return TRUE;

-    
+

     if (event->selection == GDK_SELECTION_PRIMARY)
     {
         wxTheClipboard->m_ownsPrimarySelection = FALSE;
     if (event->selection == GDK_SELECTION_PRIMARY)
     {
         wxTheClipboard->m_ownsPrimarySelection = FALSE;


@@ -241,18 +213,20 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
         wxTheClipboard->m_waiting = FALSE;
         return FALSE;
     }
         wxTheClipboard->m_waiting = FALSE;
         return FALSE;
     }

-    
+

     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)
     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;
-       }
+        {
+            wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));
+
+            delete wxTheClipboard->m_data;
+            wxTheClipboard->m_data = (wxDataObject*) NULL;
+        }

     }
     }

-  
+

     wxTheClipboard->m_waiting = FALSE;
     return TRUE;
 }
     wxTheClipboard->m_waiting = FALSE;
     return TRUE;
 }


@@ -262,68 +236,39 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data, gpointer WXUNUSED(data) )
+selection_handler( GtkWidget *WXUNUSED(widget),
+                   GtkSelectionData *selection_data,
+                   guint WXUNUSED(info),
+                   guint WXUNUSED(time),
+                   gpointer WXUNUSED(data) )

 {
     if (!wxTheClipboard) return;
 {
     if (!wxTheClipboard) return;

-  
+

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

-  
+

     wxDataObject *data = wxTheClipboard->m_data;
     wxDataObject *data = wxTheClipboard->m_data;

-    
-    if (!data->IsSupportedFormat( selection_data->target )) 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;
-    }
+    wxDataFormat format( selection_data->target );
+
+    if (!data->IsSupportedFormat( format )) return;
+
+    int size = data->GetDataSize( format );

 
 

-    int size = data->GetDataSize( selection_data->target );
-    

     if (size == 0) return;
     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 ); 
+
+    void *d = malloc(size);
+
+    // Text data will be in UTF8 in Unicode mode.
+    data->GetDataHere( selection_data->target, d );
+
+    gtk_selection_data_set(
+        selection_data,
+        GDK_SELECTION_TYPE_STRING,
+        8*sizeof(gchar),
+        (unsigned char*) d,
+        size );
+
+    free(d);

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


@@ -335,6 +280,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 wxClipboard::wxClipboard()
 {
     m_open = FALSE;
 wxClipboard::wxClipboard()
 {
     m_open = FALSE;

+    m_waiting = FALSE;

 
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
 
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;


@@ -343,43 +289,43 @@ wxClipboard::wxClipboard()
     m_receivedData = (wxDataObject*) NULL;
 
     /* we use m_targetsWidget to query what formats are available */
     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 );
 
     m_targetsWidget = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_targetsWidget );
 

-    gtk_signal_connect( GTK_OBJECT(m_targetsWidget), 
+    gtk_signal_connect( GTK_OBJECT(m_targetsWidget),

                         "selection_received",
                         "selection_received",

-                       GTK_SIGNAL_FUNC( targets_selection_received ), 
-                       (gpointer) this );
-                       
+                        GTK_SIGNAL_FUNC( targets_selection_received ),
+                        (gpointer) this );
+

     /* we use m_clipboardWidget to get and to offer data */
     /* 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), 
+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),

                         "selection_received",
                         "selection_received",

-                       GTK_SIGNAL_FUNC( selection_received ), 
-                       (gpointer) this );
+                        GTK_SIGNAL_FUNC( selection_received ),
+                        (gpointer) this );

 
 

-    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),

                         "selection_clear_event",
                         "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_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_formatSupported = FALSE;
     m_targetRequested = 0;
     m_formatSupported = FALSE;
     m_targetRequested = 0;

-    
+

     m_usePrimary = FALSE;
 }
 
 wxClipboard::~wxClipboard()
 {
     m_usePrimary = FALSE;
 }
 
 wxClipboard::~wxClipboard()
 {

-    Clear();  
-  
+    Clear();
+

     if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
     if (m_targetsWidget) gtk_widget_destroy( m_targetsWidget );
 }
     if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
     if (m_targetsWidget) gtk_widget_destroy( m_targetsWidget );
 }


@@ -390,41 +336,41 @@ void wxClipboard::Clear()
     {
 #if wxUSE_THREADS
         /* disable GUI threads */
     {
 #if wxUSE_THREADS
         /* disable GUI threads */

-        wxapp_uninstall_thread_wakeup();

 #endif
 #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)
         {
             m_waiting = TRUE;
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {
             m_waiting = TRUE;

-           
-            gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, GDK_CURRENT_TIME );
-           
+
+            gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
+                                     (guint32) GDK_CURRENT_TIME );
+

             while (m_waiting) gtk_main_iteration();
         }
             while (m_waiting) gtk_main_iteration();
         }

-    
+

         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {
             m_waiting = TRUE;
         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 );
-           
+
+            gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
+                                     (guint32) GDK_CURRENT_TIME );
+

             while (m_waiting) gtk_main_iteration();
         }
             while (m_waiting) gtk_main_iteration();
         }

-    
+

         if (m_data)
         if (m_data)

-        { 
-           delete m_data;
-           m_data = (wxDataObject*) NULL;
-       }
-       
+        {
+            delete m_data;
+            m_data = (wxDataObject*) NULL;
+        }
+

 #if wxUSE_THREADS
         /* re-enable GUI threads */
 #if wxUSE_THREADS
         /* re-enable GUI threads */

-        wxapp_install_thread_wakeup();

 #endif
     }
 #endif
     }

-  
+

     m_targetRequested = 0;
     m_formatSupported = FALSE;
 }
     m_targetRequested = 0;
     m_formatSupported = FALSE;
 }


@@ -432,18 +378,18 @@ void wxClipboard::Clear()
 bool wxClipboard::Open()
 {
     wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
 bool wxClipboard::Open()
 {
     wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );

-  
+

     m_open = TRUE;
     m_open = TRUE;

-    
+

     return TRUE;
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
     return TRUE;
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );

-  
+

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

-  
+

     Clear();
 
     return AddData( data );
     Clear();
 
     return AddData( data );


@@ -452,201 +398,222 @@ bool wxClipboard::SetData( wxDataObject *data )
 bool wxClipboard::AddData( wxDataObject *data )
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 bool wxClipboard::AddData( wxDataObject *data )
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );

-  
+

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

-    
+

     // we can only store one wxDataObject
     Clear();
     // we can only store one wxDataObject
     Clear();

-  
+

     m_data = data;
 
     m_data = data;
 

-    /* 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
+    // get formats from wxDataObjects
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );

 
 

-#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 ))
+    // primary selection or clipboard
+    GdkAtom clipboard = m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                     : g_clipboardAtom;
+
+
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)

     {
     {

-#if wxUSE_THREADS
-        /* re-enable GUI threads */
-        wxapp_install_thread_wakeup();
-#endif
-        return FALSE;
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard now supports atom %s"),
+                    array[i].GetId().c_str() );
+
+//        printf( "added %s\n", 
+//                    gdk_atom_name( array[i].GetFormatId() ) );
+                    
+        gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget),
+                                  clipboard,
+                                  array[i],
+                                  0 );  /* what is info ? */

     }
     }

-    m_ownsClipboard = TRUE;
-    
-    if (!gtk_selection_owner_set( m_clipboardWidget, 
-                                  GDK_SELECTION_PRIMARY,
-                                 GDK_CURRENT_TIME ))
-    {  
+
+    delete[] array;
+
+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
+                        "selection_get",
+                        GTK_SIGNAL_FUNC(selection_handler),
+                        (gpointer) NULL );
+

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-        /* re-enable GUI threads */
-        wxapp_install_thread_wakeup();
+    /* disable GUI threads */

 #endif
 #endif

-        return FALSE;
-    }
-    m_ownsPrimarySelection = 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 */
 #if wxUSE_THREADS
     /* re-enable GUI threads */

-    wxapp_install_thread_wakeup();

 #endif
 #endif

-       
-    return TRUE;
+
+    return res;

 }
 
 void wxClipboard::Close()
 {
     wxCHECK_RET( m_open, wxT("clipboard not open") );
 }
 
 void wxClipboard::Close()
 {
     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 )
+{
+    /* reentrance problems */
+    if (m_waiting) return FALSE;
+

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

-    

     m_targetRequested = format;
     m_targetRequested = format;

-  
+
+#if 0
+    wxLogTrace( TRACE_CLIPBOARD,
+                wxT("wxClipboard:IsSupported: requested format: %s"),
+                format.GetId().c_str() );
+#endif
+

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

-    
+

     m_formatSupported = FALSE;
     m_formatSupported = FALSE;

-  
-    /* perform query. this will set m_formatSupported to 
+
+    /* perform query. this will set m_formatSupported to

        TRUE if m_targetRequested is supported.
        TRUE if m_targetRequested is supported.

-       alsom we have to wait for the "answer" from the 
+       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
        clipboard owner which is an asynchronous process.
        therefore we set m_waiting = TRUE here and wait

-       until the callback "targets_selection_received" 
+       until the callback "targets_selection_received"

        sets it to FALSE */
 
     m_waiting = TRUE;
 
     gtk_selection_convert( m_targetsWidget,
        sets it to FALSE */
 
     m_waiting = TRUE;
 
     gtk_selection_convert( m_targetsWidget,

-                          m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, 
-                          g_targetsAtom,
-                          GDK_CURRENT_TIME );
+                           m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                        : g_clipboardAtom,
+                           g_targetsAtom,
+                           (guint32) GDK_CURRENT_TIME );

 
     while (m_waiting) gtk_main_iteration();
 
     while (m_waiting) gtk_main_iteration();

-    
+
+#if defined(__WXGTK20__) && wxUSE_UNICODE
+    if (!m_formatSupported && format == wxDataFormat(wxDF_UNICODETEXT))
+    {
+        // Another try with plain STRING format
+        extern GdkAtom g_altTextAtom;
+        return IsSupported(g_altTextAtom);
+    }
+#endif
+

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

-    
+

     return TRUE;
     return TRUE;

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

 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 {
     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();
-  
-    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 */

 
 

-    m_waiting = TRUE;
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];
+    data.GetAllFormats( array );

 
 

-    gtk_selection_convert( m_clipboardWidget,
-                          m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, 
-                          m_targetRequested,
-                          GDK_CURRENT_TIME );
-  
-    while (m_waiting) gtk_main_iteration();
+    for (size_t i = 0; i < data.GetFormatCount(); i++)
+    {
+        wxDataFormat format( array[i] );

 
 

-    /* this is a true error as we checked for the presence of such data before */
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard::GetData: requested format: %s"),
+                    format.GetId().c_str() );

 
 

-    wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") );
-  
-    return TRUE;
-}
+        /* is data supported by clipboard ? */

 
 

-//-----------------------------------------------------------------------------
-// wxClipboardModule
-//-----------------------------------------------------------------------------
+        /* store requested format to be asked for by callbacks */
+        m_targetRequested = format;

 
 

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

 
 

-bool wxClipboardModule::OnInit()
-{
-    wxTheClipboard = new wxClipboard();
-  
-    return TRUE;
-}
+        m_formatSupported = FALSE;

 
 

-void wxClipboardModule::OnExit()
-{
-    if (wxTheClipboard) delete wxTheClipboard;
-    wxTheClipboard = (wxClipboard*) NULL;
+       /* 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 */
+
+        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) 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;
+
+        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 */
+
+        m_waiting = TRUE;
+
+        wxLogTrace( TRACE_CLIPBOARD,
+                    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 );
+
+        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 success */
+        delete[] array;
+        return TRUE;
+    }
+
+    wxLogTrace( TRACE_CLIPBOARD,
+                wxT("wxClipboard::GetData: format not found") );
+
+    /* return failure */
+    delete[] array;
+    return FALSE;

 }
 
 #endif
 }
 
 #endif

-

   // wxUSE_CLIPBOARD
 
   // wxUSE_CLIPBOARD