Tests for wxTE_PROCESS_TAB again in line with other ports

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 289765439da659237a3cdcdae28045470e02b9db..bacea138e7723e98924f993775921d3110cac4f0 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -7,12 +7,17 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dnd.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "dnd.h"

 #endif
 
 #endif
 

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

 
 

+#include "wx/dnd.h"
+#include "wx/log.h"
+                                                                              
+                                                                               

 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/window.h"
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/window.h"


@@ -21,12 +26,12 @@
 #include "wx/intl.h"
 #include "wx/utils.h"
 
 #include "wx/intl.h"
 #include "wx/utils.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkprivate.h"
+#include "wx/gtk/private.h"

 
 

-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+#include <gdk/gdkprivate.h>
+
+#include <gtk/gtkdnd.h>
+#include <gtk/gtkselection.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -35,59 +40,33 @@
 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
+#endif
+

 //----------------------------------------------------------------------------
 // global data
 //----------------------------------------------------------------------------
 
 extern bool g_blockEventsOnDrag;
 
 //----------------------------------------------------------------------------
 // global data
 //----------------------------------------------------------------------------
 
 extern bool g_blockEventsOnDrag;
 

+// the flags used for the last DoDragDrop()
+static long gs_flagsForDrag = 0;
+
+// the trace mask we use with wxLogTrace() - call
+// wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here
+// (there are quite a few of them, so don't enable this by default)
+static const wxChar *TRACE_DND = _T("dnd");
+

 //----------------------------------------------------------------------------
 // standard icons
 //----------------------------------------------------------------------------
 
 /* XPM */
 //----------------------------------------------------------------------------
 // standard icons
 //----------------------------------------------------------------------------
 
 /* XPM */

-static char * gv_xpm[] = {
-"40 34 3 1",
-"         s None c None",
-".        c black",
-"X        c white",
-"                                        ",
-"                                        ",
-"                  ......                ",
-"                ..XXXXXX..              ",
-"               .XXXXXXXXXX.             ",
-"              .XXXXXXXXXXXX.            ",
-"              .XXXXXXXXXXXX.            ",
-"             .XXXXXXXXXXXXXX.           ",
-"             .XXX..XXXX..XXX.           ",
-"          ....XX....XX....XX.           ",
-"         .XXX.XXX..XXXX..XXX....        ",
-"        .XXXXXXXXXXXXXXXXXXX.XXX.       ",
-"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
-"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
-"         ..XXXXXXXXXXXXXXXXXXXXXX.      ",
-"           .XXXXXXXXXXXXXXXXXX...       ",
-"           ..XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXXX.         ",
-"            .XXXXXXXXXXXXXXXXX.         ",
-"            .XXXXXXXXXXXXXXXXXX.        ",
-"            .XXXXXXXXXXXXXXXXXXX.       ",
-"           .XXXXXXXXXXXXXXXXXXXXX.      ",
-"           .XXXXXXXXXXXXXX.XXXXXXX.     ",
-"          .XXXXXXX.XXXXXXX.XXXXXXX.     ",
-"         .XXXXXXXX.XXXXXXX.XXXXXXX.     ",
-"         .XXXXXXX...XXXXX...XXXXX.      ",
-"         .XXXXXXX.  .....   .....       ",
-"         ..XXXX..                       ",
-"           ....                         ",
-"                                        ",
-"                                        ",
-"                                        "};
-
-/* XPM */
-static char * page_xpm[] = {
+static const char * page_xpm[] = {

 /* width height ncolors chars_per_pixel */
 "32 32 5 1",
 /* colors */
 /* width height ncolors chars_per_pixel */
 "32 32 5 1",
 /* colors */


@@ -131,6 +110,30 @@ static char * page_xpm[] = {
 "    .........................   "};
 
 
 "    .........................   "};
 
 

+// ============================================================================
+// private functions
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// convert between GTK+ and wxWidgets DND constants
+// ----------------------------------------------------------------------------
+
+static wxDragResult ConvertFromGTK(long action)
+{
+    switch ( action )
+    {
+        case GDK_ACTION_COPY:
+            return wxDragCopy;
+
+        case GDK_ACTION_LINK:
+            return wxDragLink;
+
+        case GDK_ACTION_MOVE:
+            return wxDragMove;
+    }
+
+    return wxDragNone;
+}

 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 
 // ----------------------------------------------------------------------------
 // "drag_leave"


@@ -179,20 +182,53 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
 
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
 

+    // GTK+ always supposes that we want to copy the data by default while we
+    // might want to move it, so examine not only suggested_action - which is
+    // only good if we don't have our own preferences - but also the actions
+    // field
+    wxDragResult result;
+    if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
+            (context->actions & GDK_ACTION_MOVE ) )
+    {
+        // move is requested by the program and allowed by GTK+ - do it, even
+        // though suggested_action may be currently wxDragCopy
+        result = wxDragMove;
+    }
+    else // use whatever GTK+ says we should
+    {
+        result = ConvertFromGTK(context->suggested_action);
+
+        if ( (result == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) )
+        {
+            // we're requested to move but we can't
+            result = wxDragCopy;
+        }
+    }
+

     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();
+        result = drop_target->OnEnter( x, y, result );
+    }
+    else
+    {
+        /* give program a chance to react (i.e. to say no by returning FALSE) */
+        result = drop_target->OnDragOver( x, y, result );

     }
 
     }
 

-    /* give program a chance to react (i.e. to say no by returning FALSE) */
-    bool 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. */
+    bool ret = wxIsDragResultOk( result );

     if (ret)
     if (ret)

-        gdk_drag_status( context, context->suggested_action, time );
+    {
+        GdkDragAction action;
+        if (result == wxDragCopy)
+            action = GDK_ACTION_COPY;
+        else if (result == wxDragLink)
+            action = GDK_ACTION_LINK;
+        else
+            action = GDK_ACTION_MOVE;
+
+        gdk_drag_status( context, 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 );


@@ -239,16 +275,56 @@ static gboolean target_drag_drop( GtkWidget *widget,
        this is only valid for the duration of this call */
     drop_target->SetDragTime( time );
 
        this is only valid for the duration of this call */
     drop_target->SetDragTime( time );
 

+/*
+    wxDragResult result = wxDragMove;
+    if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
+*/
+
+    /* reset the block here as someone might very well
+       show a dialog as a reaction to a drop and this
+       wouldn't work without events */
+    g_blockEventsOnDrag = FALSE;
+

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

+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );
+

         /* cancel the whole thing */
         gtk_drag_finish( context,
                           FALSE,        /* no success */
                           FALSE,        /* don't delete data on dropping side */
                           time );
     }
         /* cancel the whole thing */
         gtk_drag_finish( context,
                           FALSE,        /* no success */
                           FALSE,        /* don't delete data on dropping side */
                           time );
     }

+    else
+    {
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned TRUE") );
+
+#if wxUSE_THREADS
+        /* disable GUI threads */
+#endif
+
+        GdkAtom format = drop_target->GetMatchingPair();
+
+        // this does happen somehow, see bug 555111
+        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") )
+
+/*
+        GdkDragAction action = GDK_ACTION_MOVE;
+        if (result == wxDragCopy) action == GDK_ACTION_COPY;
+        context->action = action;
+*/
+        /* this should trigger an "drag_data_received" event */
+        gtk_drag_get_data( widget,
+                           context,
+                           format,
+                           time );
+
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+#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 );


@@ -280,30 +356,34 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
     /* Owen Taylor: "call gtk_drag_finish() with
        success == TRUE" */
 
     /* 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;
     }
 

+    wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") );
+

     /* 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 ))
+    wxDragResult result = ConvertFromGTK(context->suggested_action);
+
+    if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )

     {
     {

+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") );
+

         /* tell GTK that data transfer was successfull */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
         /* tell GTK that data transfer was successfull */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {

+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );
+

         /* tell GTK that data transfer was not successfull */
         gtk_drag_finish( context, FALSE, FALSE, time );
     }
         /* tell GTK that data transfer was not successfull */
         gtk_drag_finish( context, FALSE, FALSE, time );
     }


@@ -316,7 +396,8 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 // wxDropTarget
 //----------------------------------------------------------------------------
 
 // wxDropTarget
 //----------------------------------------------------------------------------
 

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

 {
     m_firstMotion = TRUE;
     m_dragContext = (GdkDragContext*) NULL;
 {
     m_firstMotion = TRUE;
     m_dragContext = (GdkDragContext*) NULL;


@@ -325,100 +406,90 @@ wxDropTarget::wxDropTarget()
     m_dragTime = 0;
 }
 
     m_dragTime = 0;
 }
 

-wxDropTarget::~wxDropTarget()
+wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
+                                       wxCoord WXUNUSED(y),
+                                       wxDragResult def )

 {
 {

-}
+    // GetMatchingPair() checks for m_dataObject too, no need to do it here

 
 

-void wxDropTarget::OnEnter()
-{
-}
+    // disable the debug message from GetMatchingPair() - there are too many
+    // of them otherwise
+#ifdef __WXDEBUG__
+    wxLogNull noLog;
+#endif // Debug

 
 

-void wxDropTarget::OnLeave()
-{
+    return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;

 }
 
 }
 

-bool wxDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )
+bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )

 {
 {

-    return TRUE;
-}
+    if (!m_dataObject)
+        return FALSE;

 
 

-bool wxDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) )
-{
-    return FALSE;
+    return (GetMatchingPair() != (GdkAtom) 0);

 }
 
 }
 

-bool wxDropTarget::OnData( long WXUNUSED(x), long WXUNUSED(y) )
+wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                   wxDragResult def )

 {
 {

-    return FALSE;
-}
-
-bool wxDropTarget::RequestData( wxDataFormat format )
-{
-    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") );
-*/
+    if (!m_dataObject)
+        return wxDragNone;

 
 

-    /* this should trigger an "drag_data_received" event */
-    gtk_drag_get_data( m_dragWidget,
-                       m_dragContext,
-                       format.GetAtom(),
-                       m_dragTime );
+    if (GetMatchingPair() == (GdkAtom) 0)
+        return wxDragNone;

 
 

-    return TRUE;
+    return GetData() ? def : wxDragNone;

 }
 
 }
 

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

 {
 {

-    if (!m_dragContext) return FALSE;
+    if (!m_dataObject)
+        return (GdkAtom) 0;
+
+    if (!m_dragContext)
+        return (GdkAtom) 0;

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

+        wxDataFormat format( formatAtom );
+
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"),
+                   format.GetId().c_str());
+#endif // Debug

 
 

-//        char *name = gdk_atom_name( formatAtom );
-//        if (name) printf( "Format available: %s.\n", name );
+        if (m_dataObject->IsSupportedFormat( format ))
+            return formatAtom;

 
 

-        if (formatAtom == format.GetAtom()) return TRUE;

         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_dragData->target !=  data_object->GetFormat().GetAtom()) return FALSE;
+    if (!m_dataObject)
+        return FALSE;

 
 

-    if (data_object->GetFormat().GetType() == wxDF_TEXT)
-    {
-        wxTextDataObject *text_object = (wxTextDataObject*)data_object;
-        text_object->SetText( (const char*)m_dragData->data );
-    } else
+    wxDataFormat dragFormat( m_dragData->target );

 
 

-    if (data_object->GetFormat().GetType() == wxDF_FILENAME)
-    {
-    } else
+    if (!m_dataObject->IsSupportedFormat( dragFormat ))
+        return FALSE;

 
 

-    if (data_object->GetFormat().GetType() == wxDF_PRIVATE)
-    {
-        wxPrivateDataObject *priv_object = (wxPrivateDataObject*)data_object;
-        priv_object->SetData( (const char*)m_dragData->data, (size_t)m_dragData->length );
-    }
+    m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );

 
     return TRUE;
 }
 
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 {
 
     return TRUE;
 }
 
 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 );
 


@@ -437,7 +508,7 @@ void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 
 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)
 
     /* gtk_drag_dest_set() determines what default behaviour we'd like
        GTK to supply. we don't want to specify out targets (=formats)


@@ -468,200 +539,88 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
                       GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
 }
 
                       GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
 }
 

-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
-
-bool wxTextDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )
-{
-    return IsSupported( wxDF_TEXT );
-}
-
-bool wxTextDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) )
-{
-    if (IsSupported( wxDF_TEXT ))
-    {
-        RequestData( wxDF_TEXT );
-        return TRUE;
-    }
-
-    return FALSE;
-}
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------

 
 

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

 {
 {

-    wxTextDataObject data;
-    if (!GetData( &data )) return FALSE;
-
-    OnDropText( x, y, data.GetText() );
+    if (g_isIdle) wxapp_install_idle_handler();

 
 

-    return TRUE;
-}
+    wxDataFormat format( selection_data->target );

 
 

-//-------------------------------------------------------------------------
-// wxPrivateDropTarget
-//-------------------------------------------------------------------------
+    wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
+               format.GetId().c_str());

 
 

-wxPrivateDropTarget::wxPrivateDropTarget()
-{
-    m_id = wxTheApp->GetAppName();
-}
-
-wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id )
-{
-    m_id = id;
-}
+    drop_source->m_retValue = wxDragCancel;

 
 

-bool wxPrivateDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )
-{
-    return IsSupported( m_id );
-}
+    wxDataObject *data = drop_source->GetDataObject();

 
 

-bool wxPrivateDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) )
-{
-    if (!IsSupported( m_id ))
+    if (!data)

     {
     {

-        RequestData( m_id );
-        return FALSE;
+        wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );
+        return;

     }
 
     }
 

-    return FALSE;
-}
-
-bool wxPrivateDropTarget::OnData( long x, long y )
-{
-    if (!IsSupported( m_id )) return FALSE;
-
-    wxPrivateDataObject data;
-    if (!GetData( &data )) return FALSE;
-
-    OnDropData( x, y, data.GetData(), data.GetSize() );
-
-    return TRUE;
-}
-
-//----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-//----------------------------------------------------------------------------
-
-bool wxFileDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )
-{
-    return IsSupported( wxDF_FILENAME );
-}
-
-bool wxFileDropTarget::OnDrop( long x, long y )
-{
-    if (IsSupported( wxDF_FILENAME ))
+    if (!data->IsSupportedFormat(format))

     {
     {

-        RequestData( wxDF_FILENAME );
-        return TRUE;
+        wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );
+        return;

     }
 
     }
 

-    return FALSE;
-}
-
-bool wxFileDropTarget::OnData( long x, long 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;
-
-    wxChar **files = new wxChar*[number];
-
-    text = WXSTRINGCAST data.GetFiles();
-    for (i = 0; i < number; i++)
+    if (data->GetDataSize(format) == 0)

     {
     {

-        files[i] = text;
-        int len = wxStrlen( text );
-        text += len+1;
+        wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );
+        return;

     }
 
     }
 

-    OnDropFiles( x, y, number, files );
+    size_t size = data->GetDataSize(format);

 
 

-    free( files );
+//  printf( "data size: %d.\n", (int)data_size );

 
 

-    return TRUE;
-}
+    guchar *d = new guchar[size];

 
 

-//----------------------------------------------------------------------------
-// "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" );
-
-//    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)
+    if (!data->GetDataHere( format, (void*)d ))

     {
     {

-        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 );
+        delete[] d;
+        return;
+    }

 
 

-                guchar *buffer = new guchar[data_size];
-                data_object->WriteData( buffer );
+#if wxUSE_THREADS
+    /* disable GUI threads */
+#endif

 
                 gtk_selection_data_set( selection_data,
                                         selection_data->target,
                                         8,   // 8-bit
 
                 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;
-            }
-        }
+                                        d,
+                                        size );

 
 

-        node = node->Next();
-    }
+#if wxUSE_THREADS
+    /* enable GUI threads */
+#endif

 
 

-    drop_source->m_retValue = wxDragCancel;
+    delete[] d;

 }
 
 //----------------------------------------------------------------------------
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 
 }
 
 //----------------------------------------------------------------------------
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 

-static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
-                                     GdkDragContext     *WXUNUSED(context),
-                                     wxDropSource       *drop_source )
+static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
+                                     GdkDragContext *context,
+                                     wxDropSource *WXUNUSED(drop_source) )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-//    printf( "Delete the data!\n" );
-
-    drop_source->m_retValue = wxDragMove;
+    // printf( "Drag source: drag_data_delete\n" );

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


@@ -672,9 +631,10 @@ 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 source: drag_begin.\n" );

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


@@ -687,123 +647,168 @@ static void source_drag_end( GtkWidget          *WXUNUSED(widget),
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

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

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

+//-----------------------------------------------------------------------------
+// "configure_event" from m_iconWindow
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
+
+    return 0;
+}
+

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

-wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
+wxDropSource::wxDropSource(wxWindow *win,
+                           const wxIcon &iconCopy,
+                           const wxIcon &iconMove,
+                           const wxIcon &iconNone)

 {
 {

-    g_blockEventsOnDrag = TRUE;

     m_waiting = TRUE;
 
     m_waiting = TRUE;
 

+    m_iconWindow = (GtkWidget*) NULL;
+

     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_retValue = wxDragCancel;
 
     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 );
+    SetIcons(iconCopy, iconMove, iconNone);

 }
 
 }
 

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

 {
     m_waiting = TRUE;
 
 {
     m_waiting = TRUE;
 

+    SetData( data );
+
+    m_iconWindow = (GtkWidget*) NULL;
+

     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_retValue = wxDragCancel;
-
-    if (data)
-    {
-        m_data = new wxDataBroker();
-        m_data->Add( data );
-    }
-    else
-    {
-        m_data = (wxDataBroker*) NULL;
-    }

 
 

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

 
 

-    m_goIcon = go;
-    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
-    m_stopIcon = stop;
-    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
+    SetIcons(iconCopy, iconMove, iconNone);

 }
 
 }
 

-wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
+void wxDropSource::SetIcons(const wxIcon &iconCopy,
+                            const wxIcon &iconMove,
+                            const wxIcon &iconNone)

 {
 {

-    m_window = win;
-    m_widget = win->m_widget;
-    if (win->m_wxwindow) m_widget = win->m_wxwindow;
-    m_retValue = wxDragCancel;
+    m_iconCopy = iconCopy;
+    m_iconMove = iconMove;
+    m_iconNone = iconNone;

 
 

-    m_data = data;
+    if ( !m_iconCopy.Ok() )
+        m_iconCopy = wxIcon(page_xpm);
+    if ( !m_iconMove.Ok() )
+        m_iconMove = m_iconCopy;
+    if ( !m_iconNone.Ok() )
+        m_iconNone = m_iconCopy;
+}

 
 

-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+wxDropSource::~wxDropSource()
+{

 }
 
 }
 

-void wxDropSource::SetData( wxDataObject *data )
+void wxDropSource::PrepareIcon( int action, GdkDragContext *context )

 {
 {

-    if (m_data) delete m_data;
+    // get the right icon to display
+    wxIcon *icon = NULL;
+    if ( action & GDK_ACTION_MOVE )
+        icon = &m_iconMove;
+    else if ( action & GDK_ACTION_COPY )
+        icon = &m_iconCopy;
+    else
+        icon = &m_iconNone;

 
 

-    if (data)
-    {
-        m_data = new wxDataBroker();
-        m_data->Add( data );
-    }
+    GdkBitmap *mask;
+    if ( icon->GetMask() )
+        mask = icon->GetMask()->GetBitmap();

     else
     else

-    {
-        m_data = (wxDataBroker*) NULL;
-    }
-}
+        mask = (GdkBitmap *)NULL;

 
 

-void wxDropSource::SetData( wxDataBroker *data )
-{
-    if (m_data) delete m_data;
+    GdkPixmap *pixmap = icon->GetPixmap();

 
 

-    m_data = data;
-}
+    gint width,height;
+    gdk_window_get_size (pixmap, &width, &height);

 
 

-wxDropSource::~wxDropSource(void)
-{
-    if (m_data) delete m_data;
+    GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
+#ifndef __WXGTK20__
+    gtk_widget_push_visual (gdk_colormap_get_visual (colormap));
+#endif
+    gtk_widget_push_colormap (colormap);

 
 

-    g_blockEventsOnDrag = FALSE;
+    m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
+    gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+    gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE);
+
+#ifndef __WXGTK20__
+    gtk_widget_pop_visual ();
+#endif
+    gtk_widget_pop_colormap ();
+
+    gtk_widget_set_usize (m_iconWindow, width, height);
+    gtk_widget_realize (m_iconWindow);
+
+    gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event",
+        GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this );
+
+    gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE);
+
+    if (mask)
+        gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0);
+
+    gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 );

 }
 
 }
 

-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+wxDragResult wxDropSource::DoDragDrop(int flags)

 {
 {

-    wxASSERT_MSG( m_data, _T("wxDragSource: no data") );
+    wxCHECK_MSG( m_data && m_data->GetFormatCount(), wxDragNone,
+                 wxT("Drop source: no data") );

 
 

-    if (!m_data) return (wxDragResult) wxDragNone;
+    // still in drag
+    if (g_blockEventsOnDrag)
+        return wxDragNone;

 
 

+    // disabled for now

     g_blockEventsOnDrag = TRUE;
 
     RegisterWindow();
 
     m_waiting = TRUE;
 
     g_blockEventsOnDrag = TRUE;
 
     RegisterWindow();
 
     m_waiting = TRUE;
 

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

     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 );
+    size_t count = m_data->GetFormatCount();
+    for (size_t i = 0; i < count; i++)
+    {
+        GdkAtom atom = array[i];
+        wxLogTrace(TRACE_DND, wxT("Drop source: 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;
 
     GdkEventMotion event;
     event.window = m_widget->window;


@@ -814,7 +819,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     event.x = x;
     event.y = y;
     event.state = state;
     event.x = x;
     event.y = y;
     event.state = state;

-    event.time = GDK_CURRENT_TIME;
+    event.time = (guint32)GDK_CURRENT_TIME;

 
     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;
 
     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;


@@ -822,30 +827,44 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     else if (event.state & GDK_BUTTON2_MASK) button_number = 2;
     else if (event.state & GDK_BUTTON3_MASK) button_number = 3;
 
     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 */
+#endif
+

     /* don't start dragging if no button is down */
     if (button_number)
     {
     /* don't start dragging if no button is down */
     if (button_number)
     {

+        int action = GDK_ACTION_COPY;
+        if ( flags & wxDrag_AllowMove )
+            action |= GDK_ACTION_MOVE;
+
+        // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad
+        //     to use a global to pass the flags to the drop target but I'd
+        //     surely prefer a better way to do it
+        gs_flagsForDrag = flags;
+

         GdkDragContext *context = gtk_drag_begin( m_widget,
         GdkDragContext *context = gtk_drag_begin( m_widget,

-                                              target_list,
-                                              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();
-        GdkPixmap *pm = m_goIcon.GetPixmap();
-
-        gtk_drag_set_icon_pixmap( context,
-                                  gtk_widget_get_colormap( m_widget ),
-                                  pm,
-                                  bm,
-                                  0,
-                                  0 );
-
-        while (m_waiting) gtk_main_iteration();;
+                target_list,
+                (GdkDragAction)action,
+                button_number,  /* number of mouse button which started drag */
+                (GdkEvent*) &event );
+
+        m_dragContext = context;
+
+        PrepareIcon( action, context );
+
+        while (m_waiting)
+            gtk_main_iteration();
+
+        m_retValue = ConvertFromGTK(context->action);
+        if ( m_retValue == wxDragNone )
+            m_retValue = wxDragCancel;

     }
 
     }
 

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

     g_blockEventsOnDrag = FALSE;
 
     UnregisterWindow();
     g_blockEventsOnDrag = FALSE;
 
     UnregisterWindow();


@@ -883,5 +902,4 @@ void wxDropSource::UnregisterWindow()
 }
 
 #endif
 }
 
 #endif

-

       // wxUSE_DRAG_AND_DROP
       // wxUSE_DRAG_AND_DROP