]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/dnd.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mac paths updated
[wxWidgets.git] / src / gtk / dnd.cpp
diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 9596cf7d135b041d42462931c74cb4a0fd1b4f04..2c54f0805d376a51b24b3ca900e63924cd20af6b 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dnd.cpp
+// Name:        src/gtk/dnd.cpp
 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,33 +7,25 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dnd.h"
-#endif
-
-#include "wx/dnd.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_DRAG_AND_DROP
 
-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/gdicmn.h"
-#include "wx/intl.h"
-#include "wx/utils.h"
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkprivate.h"
+#include "wx/dnd.h"
 
 
-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/gdicmn.h"
+#endif
 
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#include "wx/scopeguard.h"
 
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include <gtk/gtk.h>
 
 //----------------------------------------------------------------------------
 // global data
 
 //----------------------------------------------------------------------------
 // global data
@@ -41,108 +33,137 @@ extern bool g_isIdle;
 
 extern bool g_blockEventsOnDrag;
 
 
 extern bool g_blockEventsOnDrag;
 
+// the flags used for the last DoDragDrop()
+static long gs_flagsForDrag = 0;
+
+#ifdef __WXDEBUG__
+// 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");
+#endif
+
+// global variables because GTK+ DnD want to have the
+// mouse event that caused it
+extern GdkEvent *g_lastMouseEvent;
+extern int       g_lastButtonNumber;
+
 //----------------------------------------------------------------------------
 // standard icons
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
 // 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[] = {
-/* 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",
+/* Copyright (c) Julian Smart */
+static const char * page_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 37 1",
+"5 c #7198D9",
+", c #769CDA",
+"2 c #DCE6F6",
+"i c #FFFFFF",
+"e c #779DDB",
+": c #9AB6E4",
+"9 c #EAF0FA",
+"- c #B1C7EB",
+"$ c #6992D7",
+"y c #F7F9FD",
+"= c #BED0EE",
+"q c #F0F5FC",
+"; c #A8C0E8",
+"@ c #366BC2",
+"  c None",
+"u c #FDFEFF",
+"8 c #5987D3",
+"* c #C4D5F0",
+"7 c #7CA0DC",
+"O c #487BCE",
+"< c #6B94D7",
+"& c #CCDAF2",
+"> c #89A9DF",
+"3 c #5584D1",
+"w c #82A5DE",
+"1 c #3F74CB",
+"+ c #3A70CA",
+". c #3569BF",
+"% c #D2DFF4",
+"# c #3366BB",
+"r c #F5F8FD",
+"0 c #FAFCFE",
+"4 c #DFE8F7",
+"X c #5E8AD4",
+"o c #5282D0",
+"t c #B8CCEC",
+"6 c #E5EDF9",
 /* pixels */
 /* pixels */
-"    ...................         ",
-"    .XXXXXXXXXXXXXXXXX..        ",
-"    .XXXXXXXXXXXXXXXXX.o.       ",
-"    .XXXXXXXXXXXXXXXXX.oo.      ",
-"    .XXXXXXXXXXXXXXXXX.ooo.     ",
-"    .XXXXXXXXXXXXXXXXX.oooo.    ",
-"    .XXXXXXXXXXXXXXXXX.......   ",
-"    .XXXXXOOOOOOOOOOXXXooooo.   ",
-"    .XXXXXXXXXXXXXXXXXXooooo.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .........................   "};
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"       .XXXooOO++@#             ",
+"       $%&*=-;::>,<1            ",
+"       $2%&*=-;::><:3           ",
+"       $42%&*=-;::<&:3          ",
+"       56477<<<<8<<9&:X         ",
+"       59642%&*=-;<09&:5        ",
+"       5q9642%&*=-<<<<<#        ",
+"       5qqw777<<<<<88:>+        ",
+"       erqq9642%&*=t;::+        ",
+"       eyrqq9642%&*=t;:O        ",
+"       eyywwww777<<<<t;O        ",
+"       e0yyrqq9642%&*=to        ",
+"       e00yyrqq9642%&*=o        ",
+"       eu0wwwwwww777<&*X        ",
+"       euu00yyrqq9642%&X        ",
+"       eiuu00yyrqq9642%X        ",
+"       eiiwwwwwwwwww742$        ",
+"       eiiiuu00yyrqq964$        ",
+"       eiiiiuu00yyrqq96$        ",
+"       eiiiiiuu00yyrqq95        ",
+"       eiiiiiiuu00yyrqq5        ",
+"       eeeeeeeeeeeeee55e        ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
+};
+
+
+// ============================================================================
+// 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"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
                                GdkDragContext *context,
                                guint WXUNUSED(time),
                                wxDropTarget *drop_target )
 {
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
                                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 );
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
@@ -152,16 +173,18 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
     drop_target->OnLeave();
 
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->OnLeave();
 
     /* this has to be done because GDK has no "drag_enter" event */
-    drop_target->m_firstMotion = TRUE;
+    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 );
 }
+}
 
 // ----------------------------------------------------------------------------
 // "drag_motion"
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // "drag_motion"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
                                     GdkDragContext *context,
                                     gint x,
 static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
                                     GdkDragContext *context,
                                     gint x,
@@ -169,44 +192,106 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
                                     guint time,
                                     wxDropTarget *drop_target )
 {
                                     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" */
 
     /* Owen Taylor: "if the coordinates not in a drop zone,
        return FALSE, otherwise call gtk_drag_status() and
        return TRUE" */
 
+#if 0
+    wxPrintf( "motion\n" );
+    GList *tmp_list;
+    for (tmp_list = context->targets; tmp_list; tmp_list = tmp_list->next)
+    {
+        wxString atom = wxString::FromAscii( gdk_atom_name (GDK_POINTER_TO_ATOM (tmp_list->data)) );
+        wxPrintf( "Atom: %s\n", atom );
+    }
+#endif
+
     /* 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 );
 
+    // 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 (drop_target->GetDefaultAction() == wxDragNone)
+    {
+        // use default action set by wxDropSource::DoDragDrop()
+        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;
+            }
+        }
+    }
+    else if (drop_target->GetDefaultAction() == wxDragMove &&
+                (context->actions & GDK_ACTION_MOVE))
+    {
+        
+       result = wxDragMove;
+    }
+    else
+    {
+        if (context->actions & GDK_ACTION_COPY)
+            result = wxDragCopy;
+        else if (context->actions & GDK_ACTION_MOVE)
+            result = wxDragMove;
+        else
+            result = wxDragNone;
+    }
+
     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 );
 
     /* this has to be done because GDK has no "drag_enter" event */
 
     /* 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;
+    drop_target->m_firstMotion = false;
 
     return ret;
 }
 
     return ret;
 }
+}
 
 // ----------------------------------------------------------------------------
 // "drag_drop"
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // "drag_drop"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static gboolean target_drag_drop( GtkWidget *widget,
                                   GdkDragContext *context,
                                   gint x,
 static gboolean target_drag_drop( GtkWidget *widget,
                                   GdkDragContext *context,
                                   gint x,
@@ -214,15 +299,11 @@ static gboolean target_drag_drop( GtkWidget *widget,
                                   guint time,
                                   wxDropTarget *drop_target )
 {
                                   guint time,
                                   wxDropTarget *drop_target )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     /* Owen Taylor: "if the drop is not in a drop zone,
        return FALSE, otherwise, if you aren't accepting
        the drop, call gtk_drag_finish() with success == FALSE
        otherwise call gtk_drag_data_get()" */
 
     /* Owen Taylor: "if the drop is not in a drop zone,
        return FALSE, otherwise, if you aren't accepting
        the drop, call gtk_drag_finish() with success == FALSE
        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.. */
@@ -239,16 +320,60 @@ 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)
     {
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );
+#endif
+
         /* 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
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") );
+#endif
+
+#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 );
@@ -257,15 +382,17 @@ static gboolean target_drag_drop( GtkWidget *widget,
     drop_target->SetDragWidget( (GtkWidget*) NULL );
 
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->SetDragWidget( (GtkWidget*) NULL );
 
     /* this has to be done because GDK has no "drag_enter" event */
-    drop_target->m_firstMotion = TRUE;
+    drop_target->m_firstMotion = true;
 
     return ret;
 }
 
     return ret;
 }
+}
 
 // ----------------------------------------------------------------------------
 // "drag_data_received"
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // "drag_data_received"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
                                        GdkDragContext *context,
                                        gint x,
 static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
                                        GdkDragContext *context,
                                        gint x,
@@ -275,169 +402,166 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
                                        guint time,
                                        wxDropTarget *drop_target )
 {
                                        guint time,
                                        wxDropTarget *drop_target )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     /* 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;
     }
 
+#ifdef __WXDEBUG__
+    wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") );
+#endif
+
     /* 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->action);
+
+    if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
     {
-        /* tell GTK that data transfer was successfull */
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") );
+#endif
+
+        /* tell GTK that data transfer was successful */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
-        /* tell GTK that data transfer was not successfull */
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );
+#endif
+
+        /* tell GTK that data transfer was not successful */
         gtk_drag_finish( context, FALSE, FALSE, time );
     }
 
     /* after this, invalidate the drop_target's drag data */
     drop_target->SetDragData( (GtkSelectionData*) NULL );
 }
         gtk_drag_finish( context, FALSE, FALSE, time );
     }
 
     /* after this, invalidate the drop_target's drag data */
     drop_target->SetDragData( (GtkSelectionData*) NULL );
 }
+}
 
 //----------------------------------------------------------------------------
 // wxDropTarget
 //----------------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------------
 // wxDropTarget
 //----------------------------------------------------------------------------
 
-wxDropTarget::wxDropTarget()
+wxDropTarget::wxDropTarget( wxDataObject *data )
+            : wxDropTargetBase( data )
 {
 {
-    m_firstMotion = TRUE;
+    m_firstMotion = true;
     m_dragContext = (GdkDragContext*) NULL;
     m_dragWidget = (GtkWidget*) NULL;
     m_dragData = (GtkSelectionData*) NULL;
     m_dragTime = 0;
 }
 
     m_dragContext = (GdkDragContext*) NULL;
     m_dragWidget = (GtkWidget*) NULL;
     m_dragData = (GtkSelectionData*) NULL;
     m_dragTime = 0;
 }
 
-wxDropTarget::~wxDropTarget()
-{
-}
-
-void wxDropTarget::OnEnter()
+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::OnLeave()
-{
-}
+    // disable the debug message from GetMatchingPair() - there are too many
+    // of them otherwise
+#ifdef __WXDEBUG__
+    wxLogNull noLog;
+#endif // Debug
 
 
-bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return TRUE;
+    return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;
 }
 
 }
 
-bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
 {
-    return FALSE;
-}
+    if (!m_dataObject)
+        return false;
 
 
-bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return FALSE;
+    return (GetMatchingPair() != (GdkAtom) 0);
 }
 
 }
 
-bool wxDropTarget::RequestData( wxDataFormat format )
+wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                   wxDragResult def )
 {
 {
-    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)
     {
 
     GList *child = m_dragContext->targets;
     while (child)
     {
-        GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
+        GdkAtom formatAtom = (GdkAtom)(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;
+    return true;
 }
 
 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_FUNC(target_drag_leave), (gpointer) this );
-
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                      GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
-
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                      GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
-
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                      GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_leave, this);
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_motion, this);
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_drop, this);
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_data_received, 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)
 
     /* gtk_drag_dest_set() determines what default behaviour we'd like
        GTK to supply. we don't want to specify out targets (=formats)
@@ -455,433 +579,334 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
                        0,                           /* number of targets = 0 */
                        (GdkDragAction) 0 );         /* we don't supply any actions 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_FUNC(target_drag_leave), (gpointer) this );
-
-    gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
-                      GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
-
-    gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
-                      GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
-
-    gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
-                      GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
-}
-
-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
-
-bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return IsSupported( wxDF_TEXT );
-}
-
-bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    if (IsSupported( wxDF_TEXT ))
-    {
-        RequestData( wxDF_TEXT );
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-bool wxTextDropTarget::OnData( int x, int y )
-{
-    wxTextDataObject data;
-    if (!GetData( &data )) return FALSE;
-
-    OnDropText( x, y, data.GetText() );
-
-    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 );
-}
-
-bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    if (!IsSupported( m_id ))
-    {
-        RequestData( m_id );
-        return FALSE;
-    }
-
-    return FALSE;
-}
-
-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() );
-
-    return TRUE;
-}
-
-//----------------------------------------------------------------------------
-// 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 );
-}
-
-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++;
+    g_signal_connect (widget, "drag_leave",
+                      G_CALLBACK (target_drag_leave), this);
 
 
-    if (number == 0) return FALSE;
+    g_signal_connect (widget, "drag_motion",
+                      G_CALLBACK (target_drag_motion), this);
 
 
-    wxChar **files = new wxChar*[number];
+    g_signal_connect (widget, "drag_drop",
+                      G_CALLBACK (target_drag_drop), this);
 
 
-    text = WXSTRINGCAST data.GetFiles();
-    for (i = 0; i < number; i++)
-    {
-        files[i] = text;
-        int len = wxStrlen( text );
-        text += len+1;
-    }
-
-    OnDropFiles( x, y, number, files );
-
-    free( files );
-
-    return TRUE;
+    g_signal_connect (widget, "drag_data_received",
+                      G_CALLBACK (target_drag_data_received), this);
 }
 
 //----------------------------------------------------------------------------
 // "drag_data_get"
 //----------------------------------------------------------------------------
 
 }
 
 //----------------------------------------------------------------------------
 // "drag_data_get"
 //----------------------------------------------------------------------------
 
+extern "C" {
 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),
                        wxDropSource       *drop_source )
 {
                        GtkSelectionData   *selection_data,
                        guint               WXUNUSED(info),
                        guint               WXUNUSED(time),
                        wxDropSource       *drop_source )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
-//    printf( "Provide data!\n" );
+    wxDataFormat format( selection_data->target );
 
 
-//    char *name = gdk_atom_name( selection_data->target );
-//    if (name) printf( "Format requested: %s.\n", name );
+#ifdef __WXDEBUG__
+    wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
+               format.GetId().c_str());
+#endif
 
 
-    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" );
+    drop_source->m_retValue = wxDragCancel;
 
 
-            size_t data_size = data_object->GetSize();
+    wxDataObject *data = drop_source->GetDataObject();
 
 
-            if (data_size > 0)
-            {
-//                printf( "data size: %d.\n", (int)data_size );
+    if (!data)
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );
+#endif
+       return;
+    }
 
 
-                guchar *buffer = new guchar[data_size];
-                data_object->WriteData( buffer );
+    if (!data->IsSupportedFormat(format))
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );
+#endif
+       return;
+    }
 
 
-                gtk_selection_data_set( selection_data,
-                                        selection_data->target,
-                                        8,   // 8-bit
-                                        buffer,
-                                        data_size );
+    if (data->GetDataSize(format) == 0)
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );
+#endif
+       return;
+    }
 
 
-                free( buffer );
+    size_t size = data->GetDataSize(format);
 
 
-                /* so far only copy, no moves. TODO. */
-                drop_source->m_retValue = wxDragCopy;
+//  printf( "data size: %d.\n", (int)data_size );
 
 
-                return;
-            }
-        }
+    guchar *d = new guchar[size];
 
 
-        node = node->Next();
+    if (!data->GetDataHere( format, (void*)d ))
+    {
+        delete[] d;
+        return;
     }
 
     }
 
-    drop_source->m_retValue = wxDragCancel;
-}
-
-//----------------------------------------------------------------------------
-// "drag_data_delete"
-//----------------------------------------------------------------------------
+#if wxUSE_THREADS
+    /* disable GUI threads */
+#endif
 
 
-static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
-                                     GdkDragContext     *WXUNUSED(context),
-                                     wxDropSource       *drop_source )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
+    gtk_selection_data_set( selection_data,
+                            selection_data->target,
+                            8,   // 8-bit
+                            d,
+                            size );
 
 
-//    printf( "Delete the data!\n" );
+#if wxUSE_THREADS
+    /* enable GUI threads */
+#endif
 
 
-    drop_source->m_retValue = wxDragMove;
+    delete[] d;
 }
 }
-
-//----------------------------------------------------------------------------
-// "drag_begin"
-//----------------------------------------------------------------------------
-
-static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
-                               GdkDragContext     *WXUNUSED(context),
-                               wxDropSource       *WXUNUSED(drop_source) )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-//    printf( "drag_begin.\n" );
 }
 
 //----------------------------------------------------------------------------
 // "drag_end"
 //----------------------------------------------------------------------------
 
 }
 
 //----------------------------------------------------------------------------
 // "drag_end"
 //----------------------------------------------------------------------------
 
+extern "C" {
 static void source_drag_end( GtkWidget          *WXUNUSED(widget),
                              GdkDragContext     *WXUNUSED(context),
                              wxDropSource       *drop_source )
 {
 static void source_drag_end( GtkWidget          *WXUNUSED(widget),
                              GdkDragContext     *WXUNUSED(context),
                              wxDropSource       *drop_source )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    // printf( "Drag source: drag_end.\n" );
+
+    drop_source->m_waiting = false;
+}
+}
+
+//-----------------------------------------------------------------------------
+// "configure_event" from m_iconWindow
+//-----------------------------------------------------------------------------
 
 
-//    printf( "drag_end.\n" );
+extern "C" {
+static gint
+gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
+{
+    source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
 
 
-    drop_source->m_waiting = FALSE;
+    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_drawable_get_size (pixmap, &width, &height);
 
 
-wxDropSource::~wxDropSource(void)
-{
-    if (m_data) delete m_data;
+    GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
+    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 (m_iconWindow, TRUE);
+
+    gtk_widget_pop_colormap ();
+
+    gtk_widget_set_size_request (m_iconWindow, width, height);
+    gtk_widget_realize (m_iconWindow);
 
 
-    g_blockEventsOnDrag = FALSE;
+    g_signal_connect (m_iconWindow, "configure_event",
+                      G_CALLBACK (gtk_dnd_window_configure_callback), 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;
 
 
-    g_blockEventsOnDrag = TRUE;
+    // don't start dragging if no button is down
+    if (g_lastButtonNumber == 0)
+        return wxDragNone;
 
 
-    RegisterWindow();
+    // we can only start a drag after a mouse event
+    if (g_lastMouseEvent == NULL)
+        return wxDragNone;
 
 
-    m_waiting = TRUE;
+    GTKConnectDragSignals();
+    wxON_BLOCK_EXIT_OBJ0(*this, wxDropSource::GTKDisconnectDragSignals);
 
 
-    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 );
-
-    GdkEventMotion event;
-    event.window = m_widget->window;
-    int x = 0;
-    int y = 0;
-    GdkModifierType state;
-    gdk_window_get_pointer( event.window, &x, &y, &state );
-    event.x = x;
-    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;
-
-    /* don't start dragging if no button is down */
-    if (button_number)
+
+    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++)
     {
     {
-        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();;
+        GdkAtom atom = array[i];
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));
+#endif
+       gtk_target_list_add( target_list, atom, 0, 0 );
+    }
+    delete[] array;
+
+    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,
+                target_list,
+                (GdkDragAction)action,
+                g_lastButtonNumber,  // number of mouse button which started drag
+                (GdkEvent*) g_lastMouseEvent );
+
+    if ( !context )
+    {
+        // this can happen e.g. if gdk_pointer_grab() failed
+        return wxDragError;
     }
 
     }
 
-    g_blockEventsOnDrag = FALSE;
+    m_dragContext = context;
+
+    PrepareIcon( action, context );
 
 
-    UnregisterWindow();
+    while (m_waiting)
+        gtk_main_iteration();
+
+    m_retValue = ConvertFromGTK(context->action);
+    if ( m_retValue == wxDragNone )
+         m_retValue = wxDragCancel;
 
     return m_retValue;
 }
 
 
     return m_retValue;
 }
 
-void wxDropSource::RegisterWindow()
+void wxDropSource::GTKConnectDragSignals()
 {
 {
-    if (!m_widget) return;
+    if (!m_widget)
+        return;
 
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
-                      GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this);
-    gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",
-                      GTK_SIGNAL_FUNC (source_drag_data_delete),  (gpointer) this );
-    gtk_signal_connect (GTK_OBJECT(m_widget), "drag_begin",
-                      GTK_SIGNAL_FUNC (source_drag_begin),  (gpointer) this );
-    gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end",
-                      GTK_SIGNAL_FUNC (source_drag_end),  (gpointer) this );
+    g_blockEventsOnDrag = true;
+
+    g_signal_connect (m_widget, "drag_data_get",
+                      G_CALLBACK (source_drag_data_get), this);
+    g_signal_connect (m_widget, "drag_end",
+                      G_CALLBACK (source_drag_end), this);
 
 }
 
 
 }
 
-void wxDropSource::UnregisterWindow()
+void wxDropSource::GTKDisconnectDragSignals()
 {
 {
-    if (!m_widget) return;
-
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                      GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this );
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                      GTK_SIGNAL_FUNC(source_drag_data_delete), (gpointer) this );
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                      GTK_SIGNAL_FUNC(source_drag_begin), (gpointer) this );
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                      GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this );
+    if (!m_widget)
+        return;
+
+    g_blockEventsOnDrag = false;
+
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) source_drag_data_get,
+                                          this);
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) source_drag_end,
+                                          this);
 }
 
 #endif
 }
 
 #endif
-
       // wxUSE_DRAG_AND_DROP
       // wxUSE_DRAG_AND_DROP
wxWidgets (Impactor)