Compile fix for wxDataFormat cast,

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

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index d3cd53bc4e8530fea668afb86c9a885b87fa5d0b..023cdad83c1c47a67c6fc5bf905b7b5236782ef6 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/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,7 +15,9 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #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 "glib.h"
 #include "gdk/gdk.h"


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

 };
 
 */
 };
 
 */


@@ -74,7 +76,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 #if (GTK_MINOR_VERSION > 0)
                             guint32 WXUNUSED(time),
 #endif
 #if (GTK_MINOR_VERSION > 0)
                             guint32 WXUNUSED(time),
 #endif

-                           wxClipboard *clipboard )
+                            wxClipboard *clipboard )

 {
     if (!wxTheClipboard)
     {
 {
     if (!wxTheClipboard)
     {


@@ -100,10 +102,9 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 
     for (unsigned int i=0; i<selection_data->length/sizeof(GdkAtom); i++)
     {
 
     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 ); */
+        wxDataFormat format( atoms[i] );

       
       

-        if (atoms[i] == clipboard->m_targetRequested)
+        if (format == clipboard->m_targetRequested)

         {
             clipboard->m_waiting = FALSE;
             clipboard->m_formatSupported = TRUE;
         {
             clipboard->m_waiting = FALSE;
             clipboard->m_formatSupported = TRUE;


@@ -125,7 +126,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
 #if (GTK_MINOR_VERSION > 0)
                     guint32 WXUNUSED(time),
 #endif
 #if (GTK_MINOR_VERSION > 0)
                     guint32 WXUNUSED(time),
 #endif

-                   wxClipboard *clipboard )
+                    wxClipboard *clipboard )

 {
     if (!wxTheClipboard)
     {
 {
     if (!wxTheClipboard)
     {


@@ -134,7 +135,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
     }
   
     wxDataObject *data_object = clipboard->m_receivedData;
     }
   
     wxDataObject *data_object = clipboard->m_receivedData;

-    
+

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


@@ -146,9 +147,11 @@ selection_received( GtkWidget *WXUNUSED(widget),
         clipboard->m_waiting = FALSE;
         return;
     }
         clipboard->m_waiting = FALSE;
         return;
     }

+    
+    wxDataFormat format( selection_data->target );

   
     /* make sure we got the data in the correct format */
   
     /* make sure we got the data in the correct format */

-    if (data_object->GetFormat().GetAtom() != selection_data->target)
+    if (!data_object->IsSupportedFormat( format ) )

     {
         clipboard->m_waiting = FALSE;
         return;
     {
         clipboard->m_waiting = FALSE;
         return;


@@ -156,62 +159,13 @@ selection_received( GtkWidget *WXUNUSED(widget),
 
     /* make sure we got the data in the correct form (selection type).
        if so, copy data to target object */
 
     /* 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 (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 char*) 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;

     }
     }

+            
+    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;


@@ -245,11 +199,11 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
         (!wxTheClipboard->m_ownsClipboard))
     {
         /* the clipboard is no longer in our hands. we can the delete clipboard data. */
         (!wxTheClipboard->m_ownsClipboard))
     {
         /* the clipboard is no longer in our hands. we can the delete clipboard data. */

-        if (wxTheClipboard->m_dataBroker)
-       {
-           delete wxTheClipboard->m_dataBroker;
-           wxTheClipboard->m_dataBroker = (wxDataBroker*) NULL;
-       }
+        if (wxTheClipboard->m_data)
+        {
+            delete wxTheClipboard->m_data;
+            wxTheClipboard->m_data = (wxDataObject*) NULL;
+        }

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


@@ -265,82 +219,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();
-           continue;
-       }
-       
-       switch (data_object->GetFormat().GetType())
-       {
-           case wxDF_TEXT:
-           {
-               wxTextDataObject *text_object = (wxTextDataObject*) data_object;
-           
-               wxString text = text_object->GetText();
-           
+        wxTextDataObject *text_object = (wxTextDataObject*) data;
+        wxString text( text_object->GetText() );
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-               const wxWX2MBbuf s = text.mbc_str();
-               int len = strlen(s);
+        const wxWX2MBbuf s = text.mbc_str();
+        int len = strlen(s);

 #else // more efficient in non-Unicode
 #else // more efficient in non-Unicode

-               const char *s = text.c_str();
-               int len = (int) text.Length();
+        const char *s = text.c_str();
+        int len = (int) text.Length();

 #endif
 #endif

-               
-                gtk_selection_data_set( 
-                    selection_data, 
-                   GDK_SELECTION_TYPE_STRING, 
-                   8*sizeof(gchar),
-                   (unsigned char*) (const char*) s,
-                   len ); 
-                   
-               break;
-           }
-           
-           case wxDF_BITMAP:
-           {
-               wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data_object;
-           
-               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;
-           }
-           
-           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();
+        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 ); 

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


@@ -356,8 +279,7 @@ 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;
 
     /* we use m_targetsWidget to query what formats are available */
     m_receivedData = (wxDataObject*) NULL;
 
     /* we use m_targetsWidget to query what formats are available */


@@ -367,9 +289,9 @@ wxClipboard::wxClipboard()
 
     gtk_signal_connect( GTK_OBJECT(m_targetsWidget), 
                         "selection_received",
 
     gtk_signal_connect( GTK_OBJECT(m_targetsWidget), 
                         "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 */
     
     m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
     /* we use m_clipboardWidget to get and to offer data */
     
     m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );


@@ -377,14 +299,14 @@ wxClipboard::wxClipboard()
 
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_received",
 
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_received",

-                       GTK_SIGNAL_FUNC( selection_received ), 
-                       (gpointer) this );
+                        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_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);
   


@@ -404,8 +326,8 @@ wxClipboard::~wxClipboard()
 
 void wxClipboard::Clear()
 {
 
 void wxClipboard::Clear()
 {

-    if (m_dataBroker)
-    { 
+    if (m_data)
+    {

 #if wxUSE_THREADS
         /* disable GUI threads */
         wxapp_uninstall_thread_wakeup();
 #if wxUSE_THREADS
         /* disable GUI threads */
         wxapp_uninstall_thread_wakeup();


@@ -416,27 +338,27 @@ void wxClipboard::Clear()
         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, GDK_CURRENT_TIME );

-           
+            

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

-           
+            

             while (m_waiting) gtk_main_iteration();
         }
     
             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();
 #if wxUSE_THREADS
         /* re-enable GUI threads */
         wxapp_install_thread_wakeup();


@@ -444,13 +366,12 @@ void wxClipboard::Clear()
     }
   
     m_targetRequested = 0;
     }
   
     m_targetRequested = 0;

-  

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

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

   
     m_open = TRUE;
     
   
     m_open = TRUE;
     


@@ -459,9 +380,9 @@ bool wxClipboard::Open()
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 
 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();
 
   
     Clear();
 


@@ -470,58 +391,49 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( 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();
+    /* we can only store one wxDataObject */
+    Clear();

   
   

-    /* add new data to list of offered data objects */
-    m_dataBroker->Add( data );
-    
-    /* get native format id of new data object */
-    GdkAtom format = data->GetFormat().GetAtom();
-       
-    wxCHECK_MSG( format, FALSE, _T("data has invalid format") );
-    
+    m_data = data;
+

     /* This should happen automatically, but to be on the safe side */
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
     
     /* 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), 
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+    
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
+    {
+        GdkAtom atom = array[i];
+        wxLogDebug( wxT("Clipboard Supported atom %s"), gdk_atom_name( atom ) );
+
+        /* Add handlers if someone requests data. We currently always
+           offer data to the clipboard and the primary selection. Maybe
+           we should make that depend on the usePrimary flag */
+           
+        gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), 

                               GDK_SELECTION_PRIMARY,
                               GDK_SELECTION_PRIMARY,

-                             format, 
-                             0 );  /* what is info ? */
-                            
-    gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), 
+                              atom, 
+                              0 );  /* what is info ? */
+                             
+        gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), 

                               g_clipboardAtom,
                               g_clipboardAtom,

-                             format, 
-                             0 );  /* what is info ? */
-                            
+                              atom, 
+                              0 );  /* what is info ? */
+    }
+
+    delete[] array;
+                             

     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_get",
     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
+                        GTK_SIGNAL_FUNC(selection_handler), 
+                        (gpointer) NULL );

 
 #if wxUSE_THREADS
         /* disable GUI threads */
 
 #if wxUSE_THREADS
         /* disable GUI threads */


@@ -531,7 +443,7 @@ bool wxClipboard::AddData( wxDataObject *data )
     /* Tell the world we offer clipboard data */
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   g_clipboardAtom,
     /* Tell the world we offer clipboard data */
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   g_clipboardAtom,

-                                 GDK_CURRENT_TIME ))
+                                  GDK_CURRENT_TIME ))

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


@@ -543,7 +455,7 @@ bool wxClipboard::AddData( wxDataObject *data )
     
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   GDK_SELECTION_PRIMARY,
     
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   GDK_SELECTION_PRIMARY,

-                                 GDK_CURRENT_TIME ))
+                                  GDK_CURRENT_TIME ))

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


@@ -557,26 +469,31 @@ bool wxClipboard::AddData( wxDataObject *data )
     /* re-enable GUI threads */
     wxapp_install_thread_wakeup();
 #endif
     /* re-enable GUI threads */
     wxapp_install_thread_wakeup();
 #endif

-       
+        

     return TRUE;
 }
 
 void wxClipboard::Close()
 {
     return TRUE;
 }
 
 void wxClipboard::Close()
 {

-    wxCHECK_RET( m_open, _T("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

 {
 {

-    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );
+    return m_open;
+}
+
+bool wxClipboard::IsSupported( const wxDataFormat& format )
+{
+    /* 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, _T("invalid clipboard format") );
+    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );

     
     m_formatSupported = FALSE;
   
     
     m_formatSupported = FALSE;
   


@@ -591,9 +508,10 @@ bool wxClipboard::IsSupported( wxDataFormat format )
     m_waiting = TRUE;
 
     gtk_selection_convert( m_targetsWidget,
     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,
+                           GDK_CURRENT_TIME );

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


@@ -602,73 +520,69 @@ bool wxClipboard::IsSupported( wxDataFormat format )
     return TRUE;
 }    
     
     return TRUE;
 }    
     

-bool wxClipboard::GetData( wxDataObject *data )
+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 ? */
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];
+    data.GetAllFormats( array );

     
     

-    if (!IsSupported( data->GetFormat() )) return FALSE;
+    for (size_t i = 0; i < data.GetFormatCount(); i++)
+    {
+        wxDataFormat format( array[i] );

     
     

-    /* store pointer to data object to be filled up by callbacks */
+        wxLogDebug( wxT("wxClipboard::GetData: request format %s"), format.GetId().c_str() );

     
     

-    m_receivedData = data;
+        /* is data supported by clipboard ? */
+        if (!IsSupported( format ))
+           continue;

     
     

-    /* store requested format to be asked for by callbacks */
+        /* store pointer to data object to be filled up by callbacks */
+        m_receivedData = &data;

     
     

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

   
   

-    wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard 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;
-
-    gtk_selection_convert( m_clipboardWidget,
-                          m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, 
-                          m_targetRequested,
-                          GDK_CURRENT_TIME );
+        /* start query */
+        m_formatSupported = FALSE;

   
   

-    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, _T("error retrieving data from clipboard") );
+        /* 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;
+
+        wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
+    
+        gtk_selection_convert( m_clipboardWidget,
+                               m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                            : g_clipboardAtom, 
+                               m_targetRequested,
+                               GDK_CURRENT_TIME );

   
   

-    return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// wxClipboardModule
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
-
-bool wxClipboardModule::OnInit()
-{
-    wxTheClipboard = new wxClipboard();
+        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;
+    }

   
   

-    return TRUE;
-}
-
-void wxClipboardModule::OnExit()
-{
-    if (wxTheClipboard) delete wxTheClipboard;
-    wxTheClipboard = (wxClipboard*) NULL;
+    /* return failure */
+    delete[] array;
+    return FALSE;

 }
 
 #endif
 }
 
 #endif

-

   // wxUSE_CLIPBOARD
 
   // wxUSE_CLIPBOARD