Fixed wxZlibOutputStream::Sync

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

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index d142820342067dbc2cacd8f61b57168a953904cd..d3cd53bc4e8530fea668afb86c9a885b87fa5d0b 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -13,17 +13,29 @@
 
 #include "wx/clipbrd.h"
 
 
 #include "wx/clipbrd.h"
 

+#if wxUSE_CLIPBOARD
+
+#include "wx/utils.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
+extern void wxapp_install_thread_wakeup();
+extern void wxapp_uninstall_thread_wakeup();
+#endif
+

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

-GdkAtom  g_textAtom        = 0;

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


@@ -59,27 +71,47 @@ struct _GtkSelectionData
 static void
 targets_selection_received( GtkWidget *WXUNUSED(widget), 
                             GtkSelectionData *selection_data, 
 static void
 targets_selection_received( GtkWidget *WXUNUSED(widget), 
                             GtkSelectionData *selection_data, 

+#if (GTK_MINOR_VERSION > 0)
+                            guint32 WXUNUSED(time),
+#endif

                            wxClipboard *clipboard )
 {
                            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++)
     {
   
     // 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)
         {
         if (atoms[i] == clipboard->m_targetRequested)
         {

+            clipboard->m_waiting = FALSE;

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

+    clipboard->m_waiting = FALSE;

     return;
 }
 
     return;
 }
 


@@ -90,28 +122,50 @@ 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, 

+#if (GTK_MINOR_VERSION > 0)
+                    guint32 WXUNUSED(time),
+#endif

                    wxClipboard *clipboard )
 {
                    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) return;
+    if (!data_object)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }

     
     

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

   
   

-    // make sure we got the data in the correct format
-    
-    if (data_object->m_formatAtom != selection_data->target) return;
-    
-    // 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 format */
+    if (data_object->GetFormat().GetAtom() != 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())
+    switch (data_object->GetFormat().GetType())

     {
         case wxDF_TEXT:
        {
     {
         case wxDF_TEXT:
        {

-            if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }

            
            wxTextDataObject *text_object = (wxTextDataObject *) data_object;
            
            
            wxTextDataObject *text_object = (wxTextDataObject *) data_object;
            


@@ -124,16 +178,26 @@ selection_received( GtkWidget *WXUNUSED(widget),
        
        case wxDF_BITMAP:
        {
        
        case wxDF_BITMAP:
        {

-            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP) return;
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }

            
            

-           return;
+           wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object;
+           
+           bitmap_object->SetPngData( (const char*) selection_data->data, (size_t) selection_data->length );

            
            break;
        }
        
        case wxDF_PRIVATE:
        {
            
            break;
        }
        
        case wxDF_PRIVATE:
        {

-            if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }

            
            wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object;
            
            
            wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object;
            


@@ -144,11 +208,13 @@ selection_received( GtkWidget *WXUNUSED(widget),
        
        default:
        {
        
        default:
        {

+            clipboard->m_waiting = FALSE;

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

+    clipboard->m_waiting = FALSE;

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


@@ -171,18 +237,22 @@ 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.
-    
-        wxTheClipboard->m_dataObjects.Clear();
+        /* 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;
+       }

     }
   
     }
   

+    wxTheClipboard->m_waiting = FALSE;

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -195,19 +265,21 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
 {
     if (!wxTheClipboard) return;
   
 {
     if (!wxTheClipboard) return;
   

-    wxNode *node = wxTheClipboard->m_dataObjects.First();
+    if (!wxTheClipboard->m_dataBroker) return;
+  
+    wxNode *node = wxTheClipboard->m_dataBroker->m_dataObjects.First();

     
     while (node)
     {
         wxDataObject *data_object = (wxDataObject *)node->Data();
     
     while (node)
     {
         wxDataObject *data_object = (wxDataObject *)node->Data();

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

        {
            node = node->Next();
        {
            node = node->Next();

-           break;
+           continue;

        }
        
        }
        

-       switch (data_object->GetFormat())
+       switch (data_object->GetFormat().GetType())

        {
            case wxDF_TEXT:
            {
        {
            case wxDF_TEXT:
            {


@@ -215,14 +287,19 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
            
                wxString text = text_object->GetText();
            
            
                wxString text = text_object->GetText();
            

-               char *s = WXSTRINGCAST text;
+#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();
                int len = (int) text.Length();

+#endif

                
                 gtk_selection_data_set( 
                     selection_data, 
                    GDK_SELECTION_TYPE_STRING, 
                    8*sizeof(gchar),
                
                 gtk_selection_data_set( 
                     selection_data, 
                    GDK_SELECTION_TYPE_STRING, 
                    8*sizeof(gchar),

-                   (unsigned char*) s, 
+                   (unsigned char*) (const char*) s,

                    len ); 
                    
                break;
                    len ); 
                    
                break;


@@ -230,10 +307,17 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
            
            case wxDF_BITMAP:
            {
            
            case wxDF_BITMAP:
            {

-               // wxBitmapDataObject *private_object = (wxBitmapDataObject*) data_object;
+               wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data_object;

            
            

-               // how do we do that ?
-               
+               if (bitmap_object->GetSize() == 0) return;
+           
+                gtk_selection_data_set( 
+                    selection_data, 
+                   GDK_SELECTION_TYPE_STRING, 
+                   8*sizeof(gchar), 
+                   (unsigned char*) bitmap_object->GetData(), 
+                   (int) bitmap_object->GetSize() );
+                   

                break;
            }
            
                break;
            }
            


@@ -241,14 +325,14 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
             {
                wxPrivateDataObject *private_object = (wxPrivateDataObject*) data_object;
            
             {
                wxPrivateDataObject *private_object = (wxPrivateDataObject*) data_object;
            

-               if (private_object->GetDataSize() == 0) return;
+               if (private_object->GetSize() == 0) return;

            
                 gtk_selection_data_set( 
                     selection_data, 
                    GDK_SELECTION_TYPE_STRING, 
                    8*sizeof(gchar), 
                    (unsigned char*) private_object->GetData(), 
            
                 gtk_selection_data_set( 
                     selection_data, 
                    GDK_SELECTION_TYPE_STRING, 
                    8*sizeof(gchar), 
                    (unsigned char*) private_object->GetData(), 

-                   (int) private_object->GetDataSize() );
+                   (int) private_object->GetSize() );

            }
            
            default:
            }
            
            default:


@@ -272,24 +356,42 @@ wxClipboard::wxClipboard()
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
 
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
 

-    m_dataObjects.DeleteContents( TRUE );
+    m_dataBroker = (wxDataBroker*) 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_FUNC( selection_clear_clip ), 
                        (gpointer) NULL );
                      
     if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
     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);
   
     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()


@@ -297,26 +399,48 @@ 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_dataObjects.GetCount())
+    if (m_dataBroker)

     { 
     { 

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

         /*  As we have data we also own the clipboard. Once we no longer own
             it, clear_selection is called which will set m_data to zero */
         /*  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)
         {

+            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)
         {
         }
     
         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();

         }
     
         }
     

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

     }
   
     m_targetRequested = 0;
     }
   
     m_targetRequested = 0;


@@ -326,75 +450,93 @@ void wxClipboard::Clear()
 
 bool wxClipboard::Open()
 {
 
 bool wxClipboard::Open()
 {

-    wxCHECK_MSG( !m_open, FALSE, "clipboard already open" );
+    wxCHECK_MSG( !m_open, FALSE, _T("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( data, FALSE, "data is invalid" );
+    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );

   
   

-    wxNode *node = m_dataObjects.First();
-    
-    while (node)
-    {
-        wxDataObject *d = (wxDataObject*)node->Data();
-       
-       if (d->GetFormat() == data->GetFormat())
-       {
-           m_dataObjects.DeleteNode( node );
-           
-           break;
-       }
-       
-        node = node->Next();
-    }
-    
-    m_dataObjects.Append( data );
+    wxCHECK_MSG( data, FALSE, _T("data is invalid") );

   
   

-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    Clear();
+
+    return AddData( data );
+}
+
+bool wxClipboard::AddData( wxDataObject *data )
+{
+    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );

   
   

-    if (data->GetFormat() == wxDF_PRIVATE)
-    {
-        wxPrivateDataObject* pd = (wxPrivateDataObject*) data;
-       
-        wxCHECK_MSG( !pd->GetId().IsEmpty(), FALSE, "private clipboard format requires ID string" );
+    wxCHECK_MSG( data, FALSE, _T("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 */
+    m_dataBroker->Add( data );
+    
+    /* get native format id of new data object */
+    GdkAtom format = data->GetFormat().GetAtom();

        
        

-        data->m_formatAtom = GetTargetAtom( data->GetFormat(), pd->GetId() );
-    }
-    else
-    {
-        data->m_formatAtom = GetTargetAtom( data->GetFormat() );
-    }
+    wxCHECK_MSG( format, FALSE, _T("data has invalid format") );

     
     

-    // This should happen automatically
-      
+    /* This should happen automatically, but to be on the safe side */

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

-    // Add handlers if someone requests data
-  
+    /* 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,
     gtk_selection_add_handler( m_clipboardWidget, 
                                g_clipboardAtom,

-                              data->m_formatAtom,
+                              format,

                               selection_handler,
                               selection_handler,

-                              NULL );
+                              (gpointer) NULL );

                               
     gtk_selection_add_handler( m_clipboardWidget, 
                                GDK_SELECTION_PRIMARY,
                               
     gtk_selection_add_handler( m_clipboardWidget, 
                                GDK_SELECTION_PRIMARY,

-                              data->m_formatAtom,
+                              format,

                               selection_handler,
                               selection_handler,

-                              NULL );
-                              
-    // Tell the world we offer clipboard data
-  
+                              (gpointer) NULL );
+#endif
+
+#if wxUSE_THREADS
+        /* disable GUI threads */
+        wxapp_uninstall_thread_wakeup();
+#endif
+    
+    /* Tell the world we offer clipboard data */

     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   g_clipboardAtom,
                                  GDK_CURRENT_TIME ))
     {
     if (!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;
         return FALSE;
     }
     m_ownsClipboard = TRUE;


@@ -402,131 +544,109 @@ bool wxClipboard::SetData( wxDataObject *data )
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   GDK_SELECTION_PRIMARY,
                                  GDK_CURRENT_TIME ))
     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;
         return FALSE;
     }
     m_ownsPrimarySelection = TRUE;

-                            
+    
+#if wxUSE_THREADS
+    /* re-enable GUI threads */
+    wxapp_install_thread_wakeup();
+#endif
+       

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

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

     
     m_open = FALSE;
 }
 
     
     m_open = FALSE;
 }
 

-bool wxClipboard::IsSupportedFormat( wxDataFormat format, const wxString &id )
+bool wxClipboard::IsSupported( wxDataFormat format )

 {
 {

-    m_targetRequested = GetTargetAtom( format, id );
-  
-    if (m_targetRequested == 0) return FALSE;
+    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );

     
     

-    // add handler for target (= format) query
-
-    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
-                        "selection_received",
-                       GTK_SIGNAL_FUNC( targets_selection_received ), 
-                       (gpointer) this );
+    /* store requested format to be asked for by callbacks */
+    
+    m_targetRequested = format.GetAtom();

   
   

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

     m_formatSupported = FALSE;
   
     m_formatSupported = FALSE;
   

-    // perform query. this will set m_formatSupported to 
-    // TRUE if m_targetRequested is supported
-    
-    gtk_selection_convert( m_clipboardWidget,
-                          g_clipboardAtom, 
+    /* 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 */
+
+    m_waiting = TRUE;
+
+    gtk_selection_convert( m_targetsWidget,
+                          m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, 

                           g_targetsAtom,
                           GDK_CURRENT_TIME );
 
                           g_targetsAtom,
                           GDK_CURRENT_TIME );
 

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget), 
-                                  GTK_SIGNAL_FUNC( targets_selection_received ),
-                                  (gpointer) this );
-  
+    while (m_waiting) gtk_main_iteration();
+    

     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, "clipboard not open" );
+    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );

     
     

-    m_receivedData = data;
+    /* is data supported by clipboard ? */

     
     

-    wxCHECK_MSG( m_receivedData, FALSE, "invalid data object" );
+    if (!IsSupported( data->GetFormat() )) return FALSE;

     
     

-    if (m_receivedData->GetFormat() == wxDF_PRIVATE)
-    {
-        wxPrivateDataObject* pd = (wxPrivateDataObject*) m_receivedData;
-       
-        wxCHECK_MSG( !pd->GetId().IsEmpty(), FALSE, "private clipboard format requires ID string" );
-       
-        m_targetRequested = GetTargetAtom( m_receivedData->GetFormat(), pd->GetId() );
-    }
-    else
-    {
-        m_targetRequested = GetTargetAtom( m_receivedData->GetFormat() );
-    }
+    /* store pointer to data object to be filled up by callbacks */

     
     

-    data->m_formatAtom = m_targetRequested;
-  
-    wxCHECK_MSG( m_targetRequested, FALSE, "unsupported clipboard format" );
+    m_receivedData = data;
+    
+    /* store requested format to be asked for by callbacks */
+    
+    m_targetRequested = data->GetFormat().GetAtom();

   
   

+    wxCHECK_MSG( m_targetRequested, FALSE, _T("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.  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,
 
     gtk_selection_convert( m_clipboardWidget,

-                          g_clipboardAtom, 
+                          m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, 

                           m_targetRequested,
                           GDK_CURRENT_TIME );
   
                           m_targetRequested,
                           GDK_CURRENT_TIME );
   

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget), 
-                                  GTK_SIGNAL_FUNC( selection_received ),
-                                  (gpointer) this );
+    while (m_waiting) gtk_main_iteration();

 
 

-    wxCHECK_MSG( m_formatSupported, FALSE, "error retrieving data from clipboard" );
-  
-    return TRUE;
-}
+    /* this is a true error as we checked for the presence of such data before */

 
 

-GdkAtom wxClipboard::GetTargetAtom( wxDataFormat format, const wxString &id )
-{
-    // What is X representation of that format?
+    wxCHECK_MSG( m_formatSupported, FALSE, _T("error retrieving data from clipboard") );

   
   

-    switch (format)
-    {
-        case wxDF_TEXT:
-        {
-            return GDK_TARGET_STRING;
-                               // g_textAtom
-        }
-      
-        case wxDF_BITMAP:
-        {
-            return GDK_TARGET_BITMAP;
-            break;
-        }
-      
-        case wxDF_PRIVATE:
-        {
-            // we create our own X representation
-    
-            return gdk_atom_intern( WXSTRINGCAST( id ), FALSE );
-        }
-       
-       default:
-       {
-           return (GdkAtom) 0;
-       }
-    }
-       
-    return (GdkAtom) 0;
+    return TRUE;

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


@@ -547,3 +667,8 @@ void wxClipboardModule::OnExit()
     if (wxTheClipboard) delete wxTheClipboard;
     wxTheClipboard = (wxClipboard*) NULL;
 }
     if (wxTheClipboard) delete wxTheClipboard;
     wxTheClipboard = (wxClipboard*) NULL;
 }

+
+#endif
+
+  // wxUSE_CLIPBOARD
+