*** empty log message ***

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 9378aba506d4c3a58c84af171dacfcc1c10b438c..db461c3d4455ff1a6d4ff8a80f441f8584f66da9 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.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__


@@ -35,6 +35,15 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 

+//-----------------------------------------------------------------------------
+// thread system
+//-----------------------------------------------------------------------------
+
+#if wxUSE_THREADS
+extern void wxapp_install_thread_wakeup();
+extern void wxapp_uninstall_thread_wakeup();
+#endif
+

 //----------------------------------------------------------------------------
 // global data
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // global data
 //----------------------------------------------------------------------------


@@ -48,9 +57,9 @@ extern bool g_blockEventsOnDrag;
 /* XPM */
 static char * gv_xpm[] = {
 "40 34 3 1",
 /* XPM */
 static char * gv_xpm[] = {
 "40 34 3 1",

-"      s None c None",
-".     c black",
-"X     c white",
+"         s None c None",
+".        c black",
+"X        c white",

 "                                        ",
 "                                        ",
 "                  ......                ",
 "                                        ",
 "                                        ",
 "                  ......                ",


@@ -85,17 +94,17 @@ static char * gv_xpm[] = {
 "                                        ",
 "                                        ",
 "                                        "};
 "                                        ",
 "                                        ",
 "                                        "};

-                             
+

 /* XPM */
 static char * page_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 5 1",
 /* colors */
 /* XPM */
 static char * page_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 5 1",
 /* colors */

-"      s None  c None",
-".     c black",
-"X     c wheat",
-"o     c tan",
-"O     c #6699FF",
+"         s None        c None",
+".        c black",
+"X        c wheat",
+"o        c tan",
+"O        c #6699FF",

 /* pixels */
 "    ...................         ",
 "    .XXXXXXXXXXXXXXXXX..        ",
 /* pixels */
 "    ...................         ",
 "    .XXXXXXXXXXXXXXXXX..        ",


@@ -129,31 +138,31 @@ static char * page_xpm[] = {
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .........................   "};
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .........................   "};

-                             
-                             
+
+

 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
 
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
 
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),

-                              GdkDragContext *context,
-                              guint WXUNUSED(time),
-                              wxDropTarget *drop_target )
+                               GdkDragContext *context,
+                               guint WXUNUSED(time),
+                               wxDropTarget *drop_target )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );

-    
+

     /* we don't need return values. this event is just for
        information */
     drop_target->OnLeave();
     /* we don't need return values. this event is just for
        information */
     drop_target->OnLeave();

-    
+

     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = TRUE;
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = TRUE;

-    
+

     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
 }
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
 }


@@ -163,43 +172,47 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
 // ----------------------------------------------------------------------------
 
 static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
 // ----------------------------------------------------------------------------
 
 static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),

-                                   GdkDragContext *context,
-                                   gint x,
-                                   gint y,
-                                   guint time,
-                                   wxDropTarget *drop_target )
+                                    GdkDragContext *context,
+                                    gint x,
+                                    gint y,
+                                    guint time,
+                                    wxDropTarget *drop_target )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     /* Owen Taylor: "if the coordinates not in a drop zone,
        return FALSE, otherwise call gtk_drag_status() and
        return TRUE" */
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     /* Owen Taylor: "if the coordinates not in a drop zone,
        return FALSE, otherwise call gtk_drag_status() and
        return TRUE" */

-       
+

     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );

-    
+
+    bool ret = FALSE;
+

     if (drop_target->m_firstMotion)
     {
         /* the first "drag_motion" event substitutes a "drag_enter" event */
     if (drop_target->m_firstMotion)
     {
         /* the first "drag_motion" event substitutes a "drag_enter" event */

-       drop_target->OnEnter();
+        ret = drop_target->OnEnter( x, y );

     }
     }

-    
-    /* give program a chance to react (i.e. to say no by returning FALSE) */
-    bool ret = drop_target->OnMove( x, y );
-    
+    else
+    {
+        /* give program a chance to react (i.e. to say no by returning FALSE) */
+        ret = drop_target->OnMove( x, y );
+    }
+

     /* we don't yet handle which "actions" (i.e. copy or move)
        the target accepts. so far we simply accept the
        suggested action. TODO. */
     if (ret)
         gdk_drag_status( context, context->suggested_action, time );
     /* we don't yet handle which "actions" (i.e. copy or move)
        the target accepts. so far we simply accept the
        suggested action. TODO. */
     if (ret)
         gdk_drag_status( context, context->suggested_action, time );

-    
+

     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );

-    
+

     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = FALSE;
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = FALSE;

-    
+

     return ret;
 }
 
     return ret;
 }
 


@@ -208,11 +221,11 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
 // ----------------------------------------------------------------------------
 
 static gboolean target_drag_drop( GtkWidget *widget,
 // ----------------------------------------------------------------------------
 
 static gboolean target_drag_drop( GtkWidget *widget,

-                                 GdkDragContext *context,
-                                 gint x,
-                                 gint y,
-                                 guint time,
-                                 wxDropTarget *drop_target )
+                                  GdkDragContext *context,
+                                  gint x,
+                                  gint y,
+                                  guint time,
+                                  wxDropTarget *drop_target )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 


@@ -222,43 +235,64 @@ static gboolean target_drag_drop( GtkWidget *widget,
        otherwise call gtk_drag_data_get()" */
 
 //    printf( "drop.\n" );
        otherwise call gtk_drag_data_get()" */
 
 //    printf( "drop.\n" );

-       
+

     /* this seems to make a difference between not accepting
        due to wrong target area and due to wrong format. let
        us hope that this is not required.. */
     /* this seems to make a difference between not accepting
        due to wrong target area and due to wrong format. let
        us hope that this is not required.. */

-  
+

     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );

-    
+

     /* inform the wxDropTarget about the current drag widget.
        this is only valid for the duration of this call */
     drop_target->SetDragWidget( widget );
     /* inform the wxDropTarget about the current drag widget.
        this is only valid for the duration of this call */
     drop_target->SetDragWidget( widget );

-    
+

     /* inform the wxDropTarget about the current drag time.
        this is only valid for the duration of this call */
     drop_target->SetDragTime( time );
     /* inform the wxDropTarget about the current drag time.
        this is only valid for the duration of this call */
     drop_target->SetDragTime( time );

-    
+

     bool ret = drop_target->OnDrop( x, y );
     bool ret = drop_target->OnDrop( x, y );

-    
+

     if (!ret)
     {
         /* cancel the whole thing */
         gtk_drag_finish( context,
     if (!ret)
     {
         /* cancel the whole thing */
         gtk_drag_finish( context,

-                         FALSE,        /* no success */
-                         FALSE,        /* don't delete data on dropping side */
-                         time );
+                          FALSE,        /* no success */
+                          FALSE,        /* don't delete data on dropping side */
+                          time );

     }
     }

-    
+    else
+    {
+#if wxUSE_THREADS
+        /* disable GUI threads */
+        wxapp_uninstall_thread_wakeup();
+#endif
+
+        GdkAtom format = drop_target->GetMatchingPair();
+       wxASSERT( format );
+       
+        /* this should trigger an "drag_data_received" event */
+        gtk_drag_get_data( widget,
+                           context,
+                           format,
+                           time );
+
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif
+    }
+

     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );

-    
+

     /* after this, invalidate the drop_target's drag widget */
     drop_target->SetDragWidget( (GtkWidget*) NULL );
     /* after this, invalidate the drop_target's drag widget */
     drop_target->SetDragWidget( (GtkWidget*) NULL );

-    
+

     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = TRUE;
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = TRUE;

-    
+

     return ret;
 }
 
     return ret;
 }
 


@@ -267,47 +301,46 @@ static gboolean target_drag_drop( GtkWidget *widget,
 // ----------------------------------------------------------------------------
 
 static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 // ----------------------------------------------------------------------------
 
 static void target_drag_data_received( GtkWidget *WXUNUSED(widget),

-                                      GdkDragContext *context,
-                                      gint x,
-                                      gint y,
-                                      GtkSelectionData *data,
-                                      guint WXUNUSED(info),
-                                      guint time,
-                                      wxDropTarget *drop_target )
+                                       GdkDragContext *context,
+                                       gint x,
+                                       gint y,
+                                       GtkSelectionData *data,
+                                       guint WXUNUSED(info),
+                                       guint time,
+                                       wxDropTarget *drop_target )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     /* Owen Taylor: "call gtk_drag_finish() with
        success == TRUE" */
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     /* Owen Taylor: "call gtk_drag_finish() with
        success == TRUE" */
 

-//    printf( "data received.\n" );
-       
+

     if ((data->length <= 0) || (data->format != 8))
     {
         /* negative data length and non 8-bit data format
            qualifies for junk */
         gtk_drag_finish (context, FALSE, FALSE, time);
     if ((data->length <= 0) || (data->format != 8))
     {
         /* negative data length and non 8-bit data format
            qualifies for junk */
         gtk_drag_finish (context, FALSE, FALSE, time);

-       
-//     printf( "no data.\n" );
-       
-       return;
+
+        return;

     }
     }

+
+    wxLogDebug( wxT( "Drop target: data received") );

     
     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */
     drop_target->SetDragData( data );
     
     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */
     drop_target->SetDragData( data );

-    
+

     if (drop_target->OnData( x, y ))
     {
     if (drop_target->OnData( x, y ))
     {

-       /* tell GTK that data transfer was successfull */
+        /* tell GTK that data transfer was successfull */

         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {

-       /* tell GTK that data transfer was not successfull */
+        /* tell GTK that data transfer was not successfull */

         gtk_drag_finish( context, FALSE, FALSE, time );
     }
         gtk_drag_finish( context, FALSE, FALSE, time );
     }

-    
+

     /* after this, invalidate the drop_target's drag data */
     drop_target->SetDragData( (GtkSelectionData*) NULL );
 }
     /* after this, invalidate the drop_target's drag data */
     drop_target->SetDragData( (GtkSelectionData*) NULL );
 }


@@ -316,21 +349,26 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 // wxDropTarget
 //----------------------------------------------------------------------------
 
 // wxDropTarget
 //----------------------------------------------------------------------------
 

-wxDropTarget::wxDropTarget()
+wxDropTarget::wxDropTarget( wxDataObject *data )

 {
     m_firstMotion = TRUE;
     m_dragContext = (GdkDragContext*) NULL;
     m_dragWidget = (GtkWidget*) NULL;
     m_dragData = (GtkSelectionData*) NULL;
     m_dragTime = 0;
 {
     m_firstMotion = TRUE;
     m_dragContext = (GdkDragContext*) NULL;
     m_dragWidget = (GtkWidget*) NULL;
     m_dragData = (GtkSelectionData*) NULL;
     m_dragTime = 0;

+    m_data = data;

 }
 
 wxDropTarget::~wxDropTarget()
 {
 }
 
 }
 
 wxDropTarget::~wxDropTarget()
 {
 }
 

-void wxDropTarget::OnEnter()
+bool wxDropTarget::OnEnter( int WXUNUSED(x), int WXUNUSED(y) )

 {
 {

+    if (!m_data)
+        return FALSE;
+       
+    return (GetMatchingPair() != (GdkAtom) 0);

 }
 
 void wxDropTarget::OnLeave()
 }
 
 void wxDropTarget::OnLeave()


@@ -339,359 +377,249 @@ void wxDropTarget::OnLeave()
 
 bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
 
 bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {

-    return TRUE;
+    if (!m_data)
+        return FALSE;
+       
+    return (GetMatchingPair() != (GdkAtom) 0);

 }
 
 bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
 {
 }
 
 bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
 {

-    return FALSE;
+    if (!m_data)
+        return FALSE;
+       
+    return (GetMatchingPair() != (GdkAtom) 0);

 }
 
 bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
 {
 }
 
 bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
 {

-    return FALSE;
+    if (!m_data)
+        return FALSE;
+       
+    if (GetMatchingPair() == (GdkAtom) 0)
+        return FALSE;
+       
+    return GetData();

 }
 
 }
 

-bool wxDropTarget::RequestData( wxDataFormat format )
+GdkAtom wxDropTarget::GetMatchingPair()

 {
 {

-    if (!m_dragContext) return FALSE;
-    if (!m_dragWidget) return FALSE;
-    
-/*
-    wxPrintf( _T("format: %s.\n"), format.GetId().c_str() );
-    if (format.GetType() == wxDF_PRIVATE) wxPrintf( _T("private data.\n") );
-    if (format.GetType() == wxDF_TEXT) wxPrintf( _T("text data.\n") );
-*/
-
-    /* this should trigger an "drag_data_received" event */
-    gtk_drag_get_data( m_dragWidget, 
-                      m_dragContext,
-                      format.GetAtom(),
-                      m_dragTime );
-                      
-    return TRUE;
-}
+    if (!m_data) 
+        return (GdkAtom) 0;
+
+    if (!m_dragContext) 
+        return (GdkAtom) 0;

 
 

-bool wxDropTarget::IsSupported( wxDataFormat format )
-{ 
-    if (!m_dragContext) return FALSE;
-    

     GList *child = m_dragContext->targets;
     while (child)
     {
         GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
     GList *child = m_dragContext->targets;
     while (child)
     {
         GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);

-  
-//        char *name = gdk_atom_name( formatAtom );
-//        if (name) printf( "Format available: %s.\n", name );
-  
-        if (formatAtom == format.GetAtom()) return TRUE;
+       wxDataFormat format( formatAtom );
+
+#ifdef __WXDEBUG__
+        char *name = gdk_atom_name( formatAtom );
+        if (name) wxLogDebug( "Drop target: drag has format: %s", name );
+#endif
+        if (m_data->IsSupportedFormat( format ))
+           return formatAtom;
+

         child = child->next;
     }
 
         child = child->next;
     }
 

-    return FALSE;
+    return (GdkAtom) 0;

 }
 }

-  
-bool wxDropTarget::GetData( wxDataObject *data_object )
+
+bool wxDropTarget::GetData()

 {
 {

-    if (!m_dragData) return FALSE;
+    if (!m_dragData) 
+        return FALSE;
+
+    if (!m_data) 
+        return FALSE;
+
+    wxDataFormat dragFormat( m_dragData->target );

     
     

-    if (m_dragData->target !=  data_object->GetFormat().GetAtom()) return FALSE;
-       
-    if (data_object->GetFormat().GetType() == wxDF_TEXT)
+    if (!m_data->IsSupportedFormat( dragFormat ))
+        return FALSE;
+
+    if (dragFormat.GetType() == wxDF_TEXT)

     {
     {

-        wxTextDataObject *text_object = (wxTextDataObject*)data_object;
+        wxTextDataObject *text_object = (wxTextDataObject*)m_data;

         text_object->SetText( (const char*)m_dragData->data );
         text_object->SetText( (const char*)m_dragData->data );

-    } else
-       
-    if (data_object->GetFormat().GetType() == wxDF_FILENAME)
-    {
-    } else
-       
-    if (data_object->GetFormat().GetType() == wxDF_PRIVATE)
+       return TRUE;
+    }
+
+    if (dragFormat.GetType() == wxDF_FILENAME)

     {
     {

-       wxPrivateDataObject *priv_object = (wxPrivateDataObject*)data_object;
-       priv_object->SetData( (const char*)m_dragData->data, (size_t)m_dragData->length );
+        wxFileDataObject *file_object = (wxFileDataObject*)m_data;
+        file_object->SetFiles( (const char*)m_dragData->data );
+       return TRUE;

     }
     }

-    
-    return TRUE;
+
+    return FALSE;

 }
 }

-  
+

 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 {
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 {

-    wxCHECK_RET( widget != NULL, _T("unregister widget is NULL") );
-  
+    wxCHECK_RET( widget != NULL, wxT("unregister widget is NULL") );
+

     gtk_drag_dest_unset( widget );
     gtk_drag_dest_unset( widget );

-                    
+

     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),

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

 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),

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

 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),

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

 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),

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

 }
 
 void wxDropTarget::RegisterWidget( GtkWidget *widget )
 {
 }
 
 void wxDropTarget::RegisterWidget( GtkWidget *widget )
 {

-    wxCHECK_RET( widget != NULL, _T("register widget is NULL") );
-  
+    wxCHECK_RET( widget != NULL, wxT("register widget is NULL") );
+

     /* gtk_drag_dest_set() determines what default behaviour we'd like
        GTK to supply. we don't want to specify out targets (=formats)
        or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and
        not GTK_DEST_DEFAULT_DROP). instead we react individually to
        "drag_motion" and "drag_drop" events. this makes it possible
     /* gtk_drag_dest_set() determines what default behaviour we'd like
        GTK to supply. we don't want to specify out targets (=formats)
        or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and
        not GTK_DEST_DEFAULT_DROP). instead we react individually to
        "drag_motion" and "drag_drop" events. this makes it possible

-       to allow dropping on only a small area. we should set 
+       to allow dropping on only a small area. we should set

        GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice
        highlighting if dragging over standard controls, but this
        seems to be broken without the other two. */
        GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice
        highlighting if dragging over standard controls, but this
        seems to be broken without the other two. */

-  
+

     gtk_drag_dest_set( widget,
     gtk_drag_dest_set( widget,

-                      (GtkDestDefaults) 0,         /* no default behaviour */
-                      (GtkTargetEntry*) NULL,      /* we don't supply any formats here */
-                      0,                           /* number of targets = 0 */
-                      (GdkDragAction) 0 );         /* we don't supply any actions here */
-                    
+                       (GtkDestDefaults) 0,         /* no default behaviour */
+                       (GtkTargetEntry*) NULL,      /* we don't supply any formats here */
+                       0,                           /* number of targets = 0 */
+                       (GdkDragAction) 0 );         /* we don't supply any actions here */
+

     gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",
     gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",

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

 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",

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

 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",

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

 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",

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

 }
 
 }
 

-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------

 
 

-bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
+static void
+source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
+                       GdkDragContext     *context,
+                       GtkSelectionData   *selection_data,
+                       guint               WXUNUSED(info),
+                       guint               WXUNUSED(time),
+                       wxDropSource       *drop_source )

 {
 {

-    return IsSupported( wxDF_TEXT );
-}
+    if (g_isIdle) wxapp_install_idle_handler();

 
 

-bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    if (IsSupported( wxDF_TEXT ))
-    {
-        RequestData( wxDF_TEXT );
-       return TRUE;
-    }
-    
-    return FALSE;
-}
+#ifdef __WXDEBUG__
+    char *name = gdk_atom_name( selection_data->target );
+    if (name) wxLogDebug( wxT("Drop source: format requested: %s"), name );
+#endif

 
 

-bool wxTextDropTarget::OnData( int x, int y )
-{
-    wxTextDataObject data;
-    if (!GetData( &data )) return FALSE;
+    drop_source->m_retValue = wxDragCancel;

     
     

-    OnDropText( x, y, data.GetText() );
+    wxDataObject *data = drop_source->m_data;

     
     

-    return TRUE;
-}
-
-//-------------------------------------------------------------------------
-// wxPrivateDropTarget
-//-------------------------------------------------------------------------
-
-wxPrivateDropTarget::wxPrivateDropTarget()
-{
-    m_id = wxTheApp->GetAppName();
-}
-
-wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id )
-{
-    m_id = id;
-}
-
-bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return IsSupported( m_id );
-}
+    if (!data)
+       return;

 
 

-bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    if (!IsSupported( m_id ))
-    { 
-        RequestData( m_id );
-        return FALSE;
-    }
-    
-    return FALSE;
-}
+    if (!data->IsSupportedFormat(selection_data->target))
+       return;

 
 

-bool wxPrivateDropTarget::OnData( int x, int y )
-{
-    if (!IsSupported( m_id )) return FALSE;
-    
-    wxPrivateDataObject data;
-    if (!GetData( &data )) return FALSE;
-    
-    OnDropData( x, y, data.GetData(), data.GetSize() );
+    if (data->GetDataSize(selection_data->target) == 0)
+       return;

     
     

-    return TRUE;
-}
+    size_t size = data->GetDataSize(selection_data->target);

 
 

-//----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-//----------------------------------------------------------------------------
-
-bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return IsSupported( wxDF_FILENAME );
-}
+//  printf( "data size: %d.\n", (int)data_size );

 
 

-bool wxFileDropTarget::OnDrop( int x, int y )
-{
-    if (IsSupported( wxDF_FILENAME ))
-    {
-        RequestData( wxDF_FILENAME );
-       return TRUE;
-    }
-    
-    return FALSE;
-}
-
-bool wxFileDropTarget::OnData( int x, int y )
-{
-    wxFileDataObject data;
-    if (!GetData( &data )) return FALSE;
-
-    /* get number of substrings /root/mytext.txt/0/root/myothertext.txt/0/0 */
-    size_t number = 0;
-    size_t i;
-    size_t size = data.GetFiles().Length();
-    wxChar *text = WXSTRINGCAST data.GetFiles();
-    for ( i = 0; i < size; i++)
-        if (text[i] == 0) number++;
-
-    if (number == 0) return FALSE;
+    guchar *d = new guchar[size];

     
     

-    wxChar **files = new wxChar*[number];
-  
-    text = WXSTRINGCAST data.GetFiles();
-    for (i = 0; i < number; i++)
+    if (!data->GetDataHere( selection_data->target, (void*)d ))

     {
     {

-        files[i] = text;
-        int len = wxStrlen( text );
-        text += len+1;
+        free( d );
+       return;

     }
 
     }
 

-    OnDropFiles( x, y, number, files ); 
-  
-    free( files );
-    
-    return TRUE;
-}
-
-//----------------------------------------------------------------------------
-// "drag_data_get"
-//----------------------------------------------------------------------------
-
-static void  
-source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
-                      GdkDragContext     *context,
-                      GtkSelectionData   *selection_data,
-                      guint               WXUNUSED(info),
-                      guint               WXUNUSED(time),
-                      wxDropSource       *drop_source )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-//    printf( "Provide data!\n" );
+#if wxUSE_THREADS
+    /* disable GUI threads */
+    wxapp_uninstall_thread_wakeup();
+#endif

 
 

-//    char *name = gdk_atom_name( selection_data->target );
-//    if (name) printf( "Format requested: %s.\n", name );
-    
-    wxNode *node = drop_source->m_data->m_dataObjects.First();
-    while (node)
-    {
-        wxDataObject *data_object = (wxDataObject*) node->Data();
-       if (data_object->GetFormat().GetAtom() == selection_data->target)
-       {
-//         printf( "format found.\n" );
-       
-           size_t data_size = data_object->GetSize();
-           
-           if (data_size > 0)
-           {
-//             printf( "data size: %d.\n", (int)data_size );
-           
-               guchar *buffer = new guchar[data_size];
-               data_object->WriteData( buffer );
-               

                 gtk_selection_data_set( selection_data,
                 gtk_selection_data_set( selection_data,

-                                       selection_data->target,
-                                       8,   // 8-bit
-                                       buffer, 
-                                       data_size );
-                                       
-               free( buffer );
-               
-               /* so far only copy, no moves. TODO. */
-                drop_source->m_retValue = wxDragCopy;
-           
-               return;
-           }
-       }
-    
-        node = node->Next();
-    }
+                                        selection_data->target,
+                                        8,   // 8-bit
+                                        d,
+                                        size );
+
+#if wxUSE_THREADS
+    /* enable GUI threads */
+    wxapp_install_thread_wakeup();
+#endif
+
+    free( d );

     
     

-    drop_source->m_retValue = wxDragCancel;
+    /* so far only copy, no moves. TODO. */
+    drop_source->m_retValue = wxDragCopy;

 }
 }

-  
+

 //----------------------------------------------------------------------------
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 
 static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
 //----------------------------------------------------------------------------
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 
 static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),

-                                    GdkDragContext     *WXUNUSED(context),
-                                    wxDropSource       *drop_source )
+                                     GdkDragContext     *WXUNUSED(context),
+                                     wxDropSource       *drop_source )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-//    printf( "Delete the data!\n" );
+//  printf( "Delete the data!\n" );

 
     drop_source->m_retValue = wxDragMove;
 }
 
     drop_source->m_retValue = wxDragMove;
 }

-  
+

 //----------------------------------------------------------------------------
 // "drag_begin"
 //----------------------------------------------------------------------------
 
 static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
 //----------------------------------------------------------------------------
 // "drag_begin"
 //----------------------------------------------------------------------------
 
 static void source_drag_begin( GtkWidget          *WXUNUSED(widget),

-                              GdkDragContext     *WXUNUSED(context),
-                              wxDropSource       *WXUNUSED(drop_source) )
+                               GdkDragContext     *WXUNUSED(context),
+                               wxDropSource       *WXUNUSED(drop_source) )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-//    printf( "drag_begin.\n" );
+//  printf( "drag_begin.\n" );

 }
 }

-  
+

 //----------------------------------------------------------------------------
 // "drag_end"
 //----------------------------------------------------------------------------
 
 static void source_drag_end( GtkWidget          *WXUNUSED(widget),
 //----------------------------------------------------------------------------
 // "drag_end"
 //----------------------------------------------------------------------------
 
 static void source_drag_end( GtkWidget          *WXUNUSED(widget),

-                            GdkDragContext     *WXUNUSED(context),
-                            wxDropSource       *drop_source )
+                             GdkDragContext     *WXUNUSED(context),
+                             wxDropSource       *drop_source )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-//    printf( "drag_end.\n" );
+//  printf( "drag_end.\n" );

 
     drop_source->m_waiting = FALSE;
 }
 
     drop_source->m_waiting = FALSE;
 }

-  
+

 //---------------------------------------------------------------------------
 // wxDropSource
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // wxDropSource
 //---------------------------------------------------------------------------


@@ -700,111 +628,88 @@ wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop
 {
     g_blockEventsOnDrag = TRUE;
     m_waiting = TRUE;
 {
     g_blockEventsOnDrag = TRUE;
     m_waiting = TRUE;

-  
+

     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;
     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;

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

     m_retValue = wxDragCancel;
 
     m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
     m_goaheadCursor = wxCursor( wxCURSOR_HAND );
     m_retValue = wxDragCancel;
 
     m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
     m_goaheadCursor = wxCursor( wxCURSOR_HAND );

-    
+

     m_goIcon = go;
     if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
     m_stopIcon = stop;
     if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 
     m_goIcon = go;
     if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
     m_stopIcon = stop;
     if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 

-wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
+wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win,
+                            const wxIcon &go, const wxIcon &stop )

 {
     m_waiting = TRUE;
 {
     m_waiting = TRUE;

-  
+

     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;
     m_retValue = wxDragCancel;
     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;
     m_retValue = wxDragCancel;

-  
-    if (data)
-    {
-        m_data = new wxDataBroker();
-       m_data->Add( data );
-    }
-    else
-    {
-        m_data = (wxDataBroker*) NULL;
-    }
+
+    m_data = &data;

 
     m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
     m_goaheadCursor = wxCursor( wxCURSOR_HAND );
 
     m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
     m_goaheadCursor = wxCursor( wxCURSOR_HAND );

-    
+

     m_goIcon = go;
     if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
     m_stopIcon = stop;
     if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 
     m_goIcon = go;
     if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
     m_stopIcon = stop;
     if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 

-wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
+void wxDropSource::SetData( wxDataObject& data )

 {
 {

-    m_window = win;
-    m_widget = win->m_widget;
-    if (win->m_wxwindow) m_widget = win->m_wxwindow;
-    m_retValue = wxDragCancel;
-  
-    m_data = data;
-
-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-}
+    if (m_data)
+        delete m_data;

 
 

-void wxDropSource::SetData( wxDataObject *data )
-{
-    if (m_data) delete m_data;
-    
-    if (data)
-    {
-        m_data = new wxDataBroker();
-       m_data->Add( data );
-    }
-    else
-    {
-        m_data = (wxDataBroker*) NULL;
-    }
+    m_data = &data;

 }
 
 }
 

-void wxDropSource::SetData( wxDataBroker *data )
+wxDropSource::~wxDropSource()

 {
 {

-    if (m_data) delete m_data;
-    
-    m_data = data;
-}
-
-wxDropSource::~wxDropSource(void)
-{
-    if (m_data) delete m_data;
+    if (m_data) 
+//        delete m_data;

 
     g_blockEventsOnDrag = FALSE;
 }
 
     g_blockEventsOnDrag = FALSE;
 }

-   
+

 wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 {
 wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 {

-    wxASSERT_MSG( m_data, _T("wxDragSource: no data") );
-  
-    if (!m_data) return (wxDragResult) wxDragNone;
-  
+    wxASSERT_MSG( m_data, wxT("wxDragSource: no data") );
+
+    if (!m_data) 
+        return (wxDragResult) wxDragNone;
+
+    if (m_data->GetFormatCount() == 0) 
+        return (wxDragResult) wxDragNone;
+       

     g_blockEventsOnDrag = TRUE;
     g_blockEventsOnDrag = TRUE;

-  
+

     RegisterWindow();
     RegisterWindow();

-    
-    m_waiting = TRUE;

 
 

-    GdkAtom atom = gdk_atom_intern( "STRING", FALSE );
-//    wxPrintf( _T("atom id: %d.\n"), (int)atom );
+    m_waiting = TRUE;

 
     GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
 
     GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );

-    gtk_target_list_add( target_list, atom, 0, 0 );

     
     

+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array, TRUE );
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
+    {
+        GdkAtom atom = array[i];
+       wxLogDebug( wxT("Supported atom %s"), gdk_atom_name( atom ) );
+        gtk_target_list_add( target_list, atom, 0, 0 );
+    }
+    delete[] array;
+

     GdkEventMotion event;
     event.window = m_widget->window;
     int x = 0;
     GdkEventMotion event;
     event.window = m_widget->window;
     int x = 0;


@@ -815,39 +720,49 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     event.y = y;
     event.state = state;
     event.time = GDK_CURRENT_TIME;
     event.y = y;
     event.state = state;
     event.time = GDK_CURRENT_TIME;

-    
+

     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;
     if (event.state & GDK_BUTTON1_MASK) button_number = 1;
     else if (event.state & GDK_BUTTON2_MASK) button_number = 2;
     else if (event.state & GDK_BUTTON3_MASK) button_number = 3;
 
     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;
     if (event.state & GDK_BUTTON1_MASK) button_number = 1;
     else if (event.state & GDK_BUTTON2_MASK) button_number = 2;
     else if (event.state & GDK_BUTTON3_MASK) button_number = 3;
 

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

     /* don't start dragging if no button is down */
     if (button_number)
     {
         GdkDragContext *context = gtk_drag_begin( m_widget,
                                               target_list,
     /* don't start dragging if no button is down */
     if (button_number)
     {
         GdkDragContext *context = gtk_drag_begin( m_widget,
                                               target_list,

-                                             GDK_ACTION_COPY,
-                                             button_number,  /* number of mouse button which started drag */
-                                             (GdkEvent*) &event );
-       
+                                              GDK_ACTION_COPY,
+                                              button_number,  /* number of mouse button which started drag */
+                                              (GdkEvent*) &event );
+

         wxMask *mask = m_goIcon.GetMask();
         GdkBitmap *bm = (GdkBitmap *) NULL;
         if (mask) bm = mask->GetBitmap();
         wxMask *mask = m_goIcon.GetMask();
         GdkBitmap *bm = (GdkBitmap *) NULL;
         if (mask) bm = mask->GetBitmap();

-       GdkPixmap *pm = m_goIcon.GetPixmap();
-       
+        GdkPixmap *pm = m_goIcon.GetPixmap();
+

         gtk_drag_set_icon_pixmap( context,
         gtk_drag_set_icon_pixmap( context,

-                                 gtk_widget_get_colormap( m_widget ),
-                                 pm,
-                                 bm,
-                                 0,
-                                 0 );
-    
+                                  gtk_widget_get_colormap( m_widget ),
+                                  pm,
+                                  bm,
+                                  0,
+                                  0 );
+

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

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

     g_blockEventsOnDrag = FALSE;
     g_blockEventsOnDrag = FALSE;

-    
+

     UnregisterWindow();
 
     return m_retValue;
     UnregisterWindow();
 
     return m_retValue;


@@ -856,30 +771,30 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 void wxDropSource::RegisterWindow()
 {
     if (!m_widget) return;
 void wxDropSource::RegisterWindow()
 {
     if (!m_widget) return;

-    
+

     gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
     gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",

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

     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",

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

     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_begin",
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_begin",

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

     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end",
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end",

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

 
 }
 
 void wxDropSource::UnregisterWindow()
 {
     if (!m_widget) return;
 
 }
 
 void wxDropSource::UnregisterWindow()
 {
     if (!m_widget) return;

-    
+

     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),

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

     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),

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

     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),

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

     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),

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

 }
 
 #endif
 }
 
 #endif