Applied [ 821234 ] Fix: erroneous assertion failed wxListBox::SetSelection

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index f59b86d3304c00d2d7b8fcc1408c164fdc8f7c07..2181646be5aa88eb64dd8c612b33e93d6ec91f2b 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


@@ -40,8 +45,6 @@ extern bool g_isIdle;
 //-----------------------------------------------------------------------------
 
 #if wxUSE_THREADS
 //-----------------------------------------------------------------------------
 
 #if wxUSE_THREADS

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

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


@@ -50,53 +53,20 @@ extern void wxapp_uninstall_thread_wakeup();
 
 extern bool g_blockEventsOnDrag;
 
 
 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 */


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

+// ============================================================================
+// private functions
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// convert between GTK+ and wxWindows 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"


@@ -188,24 +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 );
 

-    bool ret = FALSE;
+    // 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 */

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

     }
     else
     {
         /* give program a chance to react (i.e. to say no by returning FALSE) */
     }
     else
     {
         /* give program a chance to react (i.e. to say no by returning FALSE) */

-        ret = drop_target->OnMove( x, y );
+        result = drop_target->OnDragOver( x, y, result );

     }
 
     }
 

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


@@ -252,10 +275,22 @@ 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 */
         /* cancel the whole thing */
         gtk_drag_finish( context,
                           FALSE,        /* no success */


@@ -264,14 +299,22 @@ static gboolean target_drag_drop( GtkWidget *widget,
     }
     else
     {
     }
     else
     {

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

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

-        wxapp_uninstall_thread_wakeup();

 #endif
 
         GdkAtom format = drop_target->GetMatchingPair();
 #endif
 
         GdkAtom format = drop_target->GetMatchingPair();

-       wxASSERT( format );
-       
+
+        // 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,
         /* this should trigger an "drag_data_received" event */
         gtk_drag_get_data( widget,
                            context,


@@ -280,7 +323,6 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
 #if wxUSE_THREADS
         /* re-enable GUI threads */
 
 #if wxUSE_THREADS
         /* re-enable GUI threads */

-        wxapp_install_thread_wakeup();

 #endif
     }
 
 #endif
     }
 


@@ -314,7 +356,6 @@ 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" */
 

-

     if ((data->length <= 0) || (data->format != 8))
     {
         /* negative data length and non 8-bit data format
     if ((data->length <= 0) || (data->format != 8))
     {
         /* negative data length and non 8-bit data format


@@ -324,19 +365,25 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
         return;
     }
 
         return;
     }
 

-    wxLogDebug( wxT( "Drop target: data received") );
-    
+    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 );
     }


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

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

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


@@ -359,61 +406,62 @@ wxDropTarget::wxDropTarget( wxDataObject *data )
     m_dragTime = 0;
 }
 
     m_dragTime = 0;
 }
 

-bool wxDropTarget::OnEnter( int WXUNUSED(x), int WXUNUSED(y) )
+wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
+                                       wxCoord WXUNUSED(y),
+                                       wxDragResult def )

 {
 {

-    if (!m_dataObject)
-        return FALSE;
-       
-    return (GetMatchingPair() != (GdkAtom) 0);
-}
+    // GetMatchingPair() checks for m_dataObject too, no need to do it here

 
 

-bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    if (!m_dataObject)
-        return FALSE;
-       
-    return (GetMatchingPair() != (GdkAtom) 0);
+    // disable the debug message from GetMatchingPair() - there are too many
+    // of them otherwise
+#ifdef __WXDEBUG__
+    wxLogNull noLog;
+#endif // Debug
+
+    return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;

 }
 
 }
 

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

 {
     if (!m_dataObject)
         return FALSE;
 {
     if (!m_dataObject)
         return FALSE;

-       
+

     return (GetMatchingPair() != (GdkAtom) 0);
 }
 
     return (GetMatchingPair() != (GdkAtom) 0);
 }
 

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

 {
     if (!m_dataObject)
 {
     if (!m_dataObject)

-        return FALSE;
-       
+        return wxDragNone;
+

     if (GetMatchingPair() == (GdkAtom) 0)
     if (GetMatchingPair() == (GdkAtom) 0)

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

 }
 
 GdkAtom wxDropTarget::GetMatchingPair()
 {
 }
 
 GdkAtom wxDropTarget::GetMatchingPair()
 {

-    if (!m_dataObject) 
+    if (!m_dataObject)

         return (GdkAtom) 0;
 
         return (GdkAtom) 0;
 

-    if (!m_dragContext) 
+    if (!m_dragContext)

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

-       wxDataFormat format( formatAtom );
+        wxDataFormat format( formatAtom );

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-        char *name = gdk_atom_name( formatAtom );
-        if (name) wxLogDebug( "Drop target: drag has format: %s", name );
-#endif
+        wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"),
+                   format.GetId().c_str());
+#endif // Debug
+

         if (m_dataObject->IsSupportedFormat( format ))
         if (m_dataObject->IsSupportedFormat( format ))

-           return formatAtom;
+            return formatAtom;

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


@@ -423,32 +471,20 @@ GdkAtom wxDropTarget::GetMatchingPair()
 
 bool wxDropTarget::GetData()
 {
 
 bool wxDropTarget::GetData()
 {

-    if (!m_dragData) 
+    if (!m_dragData)

         return FALSE;
 
         return FALSE;
 

-    if (!m_dataObject) 
+    if (!m_dataObject)

         return FALSE;
 
     wxDataFormat dragFormat( m_dragData->target );
         return FALSE;
 
     wxDataFormat dragFormat( m_dragData->target );

-    
+

     if (!m_dataObject->IsSupportedFormat( dragFormat ))
         return FALSE;
 
     if (!m_dataObject->IsSupportedFormat( dragFormat ))
         return FALSE;
 

-    if (dragFormat.GetType() == wxDF_TEXT)
-    {
-        wxTextDataObject *text_object = (wxTextDataObject*)m_dataObject;
-        text_object->SetText( (const char*)m_dragData->data );
-       return TRUE;
-    }
-
-    if (dragFormat.GetType() == wxDF_FILENAME)
-    {
-        wxFileDataObject *file_object = (wxFileDataObject*)m_dataObject;
-        file_object->SetData( 0, (const char*)m_dragData->data );
-       return TRUE;
-    }
+    m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );

 
 

-    return FALSE;
+    return TRUE;

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


@@ -509,7 +545,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
 
 static void
 source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
 static void
 source_drag_data_get  (GtkWidget          *WXUNUSED(widget),

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

                        GtkSelectionData   *selection_data,
                        guint               WXUNUSED(info),
                        guint               WXUNUSED(time),
                        GtkSelectionData   *selection_data,
                        guint               WXUNUSED(info),
                        guint               WXUNUSED(time),


@@ -517,39 +553,47 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-#ifdef __WXDEBUG__
-    char *name = gdk_atom_name( selection_data->target );
-    if (name) wxLogDebug( wxT("Drop source: format requested: %s"), name );
-#endif
+    wxDataFormat format( selection_data->target );
+
+    wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
+               format.GetId().c_str());

 
     drop_source->m_retValue = wxDragCancel;
 
     drop_source->m_retValue = wxDragCancel;

-    
-    wxDataObject *data = drop_source->m_data;
-    
+
+    wxDataObject *data = drop_source->GetDataObject();
+

     if (!data)
     if (!data)

-       return;
+    {
+        wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );
+        return;
+    }

 
 

-    if (!data->IsSupportedFormat(selection_data->target))
-       return;
+    if (!data->IsSupportedFormat(format))
+    {
+        wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );
+        return;
+    }
+
+    if (data->GetDataSize(format) == 0)
+    {
+        wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );
+        return;
+    }

 
 

-    if (data->GetDataSize(selection_data->target) == 0)
-       return;
-    
-    size_t size = data->GetDataSize(selection_data->target);
+    size_t size = data->GetDataSize(format);

 
 //  printf( "data size: %d.\n", (int)data_size );
 
     guchar *d = new guchar[size];
 
 //  printf( "data size: %d.\n", (int)data_size );
 
     guchar *d = new guchar[size];

-    
-    if (!data->GetDataHere( selection_data->target, (void*)d ))
+
+    if (!data->GetDataHere( format, (void*)d ))

     {
     {

-        free( d );
-       return;
+        delete[] d;
+        return;

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

-    wxapp_uninstall_thread_wakeup();

 #endif
 
                 gtk_selection_data_set( selection_data,
 #endif
 
                 gtk_selection_data_set( selection_data,


@@ -560,28 +604,23 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
 #if wxUSE_THREADS
     /* enable GUI threads */
 
 #if wxUSE_THREADS
     /* enable GUI threads */

-    wxapp_install_thread_wakeup();

 #endif
 
 #endif
 

-    free( d );
-    
-    /* so far only copy, no moves. TODO. */
-    drop_source->m_retValue = wxDragCopy;
+    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" );

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


@@ -592,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" );

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


@@ -607,71 +647,150 @@ 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_retValue = wxDragCancel;
 
     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;
 
     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 );
 
     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;
 
     m_retValue = wxDragCancel;
 

-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    SetIcons(iconCopy, iconMove, iconNone);
+}

 
 

-    m_goIcon = go;
-    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
-    m_stopIcon = stop;
-    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
+void wxDropSource::SetIcons(const wxIcon &iconCopy,
+                            const wxIcon &iconMove,
+                            const wxIcon &iconNone)
+{
+    m_iconCopy = iconCopy;
+    m_iconMove = iconMove;
+    m_iconNone = iconNone;
+
+    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;

 }
 
 wxDropSource::~wxDropSource()
 {
 }
 
 wxDropSource::~wxDropSource()
 {

-    g_blockEventsOnDrag = FALSE;

 }
 
 }
 

-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+void wxDropSource::PrepareIcon( int action, GdkDragContext *context )

 {
 {

-    wxASSERT_MSG( m_data, wxT("wxDragSource: no 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;
+
+    GdkBitmap *mask;
+    if ( icon->GetMask() )
+        mask = icon->GetMask()->GetBitmap();
+    else
+        mask = (GdkBitmap *)NULL;
+
+    GdkPixmap *pixmap = icon->GetPixmap();
+
+    gint width,height;
+    gdk_window_get_size (pixmap, &width, &height);
+
+    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);
+
+    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);

 
 

-    if (!m_data) 
-        return (wxDragResult) wxDragNone;
+    gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event",
+        GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this );

 
 

-    if (m_data->GetFormatCount() == 0) 
-        return (wxDragResult) wxDragNone;
-       
+    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(int flags)
+{
+    wxCHECK_MSG( m_data && m_data->GetFormatCount(), wxDragNone,
+                 wxT("Drop source: no data") );
+
+    // still in drag
+    if (g_blockEventsOnDrag)
+        return wxDragNone;
+
+    // disabled for now

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


@@ -679,13 +798,14 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
     m_waiting = TRUE;
 
     GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
     m_waiting = TRUE;
 
     GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );

-    
+

     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );

-    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
+    size_t count = m_data->GetFormatCount();
+    for (size_t i = 0; i < count; i++)

     {
         GdkAtom atom = array[i];
     {
         GdkAtom atom = array[i];

-       wxLogDebug( wxT("Supported atom %s"), gdk_atom_name( atom ) );
+        wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));

         gtk_target_list_add( target_list, atom, 0, 0 );
     }
     delete[] array;
         gtk_target_list_add( target_list, atom, 0, 0 );
     }
     delete[] array;


@@ -699,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;


@@ -709,36 +829,40 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 
 #if wxUSE_THREADS
     /* disable GUI threads */
 
 #if wxUSE_THREADS
     /* disable GUI threads */

-    wxapp_uninstall_thread_wakeup();

 #endif
 
     /* don't start dragging if no button is down */
     if (button_number)
     {
 #endif
 
     /* 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 */
     }
 
 #if wxUSE_THREADS
     /* re-enable GUI threads */

-    wxapp_install_thread_wakeup();

 #endif
 
     g_blockEventsOnDrag = FALSE;
 #endif
 
     g_blockEventsOnDrag = FALSE;


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

-

       // wxUSE_DRAG_AND_DROP
       // wxUSE_DRAG_AND_DROP