]> 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
Doc/distribution script mods
[wxWidgets.git] / src / gtk / dnd.cpp
diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index ae53201b1bdf172955d696297206f4d21b3da3c2..745dec2fdb162fe8c298489e8a37b6356d0ce99d 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -4,11 +4,11 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "dnd.h"
+    #pragma implementation "dnd.h"
 #endif
 
 #include "wx/dnd.h"
 #endif
 
 #include "wx/dnd.h"
@@ -21,12 +21,28 @@
 #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 <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>
 
 
-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+#include <gtk/gtkdnd.h>
+#include <gtk/gtkselection.h>
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
+//-----------------------------------------------------------------------------
+// thread system
+//-----------------------------------------------------------------------------
+
+#if wxUSE_THREADS
+extern void wxapp_install_thread_wakeup();
+extern void wxapp_uninstall_thread_wakeup();
+#endif
 
 //----------------------------------------------------------------------------
 // global data
 
 //----------------------------------------------------------------------------
 // global data
@@ -38,57 +54,16 @@ extern bool g_blockEventsOnDrag;
 // 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 */
 /* XPM */
 static char * page_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 5 1",
 /* colors */
-"      s None  c None",
-".     c black",
-"X     c wheat",
-"o     c tan",
-"O     c #6699FF",
+"         s None        c None",
+".        c black",
+"X        c wheat",
+"o        c tan",
+"O        c #6699FF",
 /* pixels */
 "    ...................         ",
 "    .XXXXXXXXXXXXXXXXX..        ",
 /* pixels */
 "    ...................         ",
 "    .XXXXXXXXXXXXXXXXX..        ",
@@ -122,29 +97,31 @@ static char * page_xpm[] = {
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .........................   "};
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .........................   "};
-                             
-                             
+
+
 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
 
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
 
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
-                              GdkDragContext *context,
-                              guint WXUNUSED(time),
-                              wxDropTarget *drop_target )
+                               GdkDragContext *context,
+                               guint WXUNUSED(time),
+                               wxDropTarget *drop_target )
 {
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
-    
+
     /* we don't need return values. this event is just for
        information */
     drop_target->OnLeave();
     /* we don't need return values. this event is just for
        information */
     drop_target->OnLeave();
-    
+
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = TRUE;
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = TRUE;
-    
+
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
 }
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
 }
@@ -154,41 +131,57 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
 // ----------------------------------------------------------------------------
 
 static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
 // ----------------------------------------------------------------------------
 
 static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
-                                   GdkDragContext *context,
-                                   gint x,
-                                   gint y,
-                                   guint time,
-                                   wxDropTarget *drop_target )
+                                    GdkDragContext *context,
+                                    gint x,
+                                    gint y,
+                                    guint time,
+                                    wxDropTarget *drop_target )
 {
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     /* Owen Taylor: "if the coordinates not in a drop zone,
        return FALSE, otherwise call gtk_drag_status() and
        return TRUE" */
     /* Owen Taylor: "if the coordinates not in a drop zone,
        return FALSE, otherwise call gtk_drag_status() and
        return TRUE" */
-       
+
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
-    
+
+    wxDragResult result;
+    if ( context->suggested_action == GDK_ACTION_COPY )
+        result = wxDragCopy;
+    else
+        result = wxDragMove;
+
     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 );
     }
     }
-    
-    /* 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. */
+    else
+    {
+        /* give program a chance to react (i.e. to say no by returning FALSE) */
+        result = drop_target->OnDragOver( x, y, result );
+    }
+
+    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
+            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 );
-    
+
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = FALSE;
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = FALSE;
-    
+
     return ret;
 }
 
     return ret;
 }
 
@@ -197,55 +190,92 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
 // ----------------------------------------------------------------------------
 
 static gboolean target_drag_drop( GtkWidget *widget,
 // ----------------------------------------------------------------------------
 
 static gboolean target_drag_drop( GtkWidget *widget,
-                                 GdkDragContext *context,
-                                 gint x,
-                                 gint y,
-                                 guint time,
-                                 wxDropTarget *drop_target )
+                                  GdkDragContext *context,
+                                  gint x,
+                                  gint y,
+                                  guint time,
+                                  wxDropTarget *drop_target )
 {
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     /* 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" );
     /* 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.. */
-  
+
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
-    
+
     /* inform the wxDropTarget about the current drag widget.
        this is only valid for the duration of this call */
     drop_target->SetDragWidget( widget );
     /* inform the wxDropTarget about the current drag widget.
        this is only valid for the duration of this call */
     drop_target->SetDragWidget( widget );
-    
+
     /* inform the wxDropTarget about the current drag time.
        this is only valid for the duration of this call */
     drop_target->SetDragTime( time );
     /* inform the wxDropTarget about the current drag time.
        this is only valid for the duration of this call */
     drop_target->SetDragTime( time );
-    
+
+/*
+    wxDragResult result = wxDragMove;
+    if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
+*/
+
     bool ret = drop_target->OnDrop( x, y );
     bool ret = drop_target->OnDrop( x, y );
-    
+
     if (!ret)
     {
     if (!ret)
     {
+        wxLogDebug( wxT( "Drop target: OnDrop returned FALSE") );
+
         /* cancel the whole thing */
         gtk_drag_finish( context,
         /* cancel the whole thing */
         gtk_drag_finish( context,
-                         FALSE,        /* no success */
-                         FALSE,        /* don't delete data on dropping side */
-                         time );
+                          FALSE,        /* no success */
+                          FALSE,        /* don't delete data on dropping side */
+                          time );
     }
     }
-    
+    else
+    {
+        wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );
+
+#if wxUSE_THREADS
+        /* disable GUI threads */
+        wxapp_uninstall_thread_wakeup();
+#endif
+
+        GdkAtom format = drop_target->GetMatchingPair();
+        wxASSERT( 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 */
+        wxapp_install_thread_wakeup();
+#endif
+    }
+
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
     /* after this, invalidate the drop_target's GdkDragContext */
     drop_target->SetDragContext( (GdkDragContext*) NULL );
-    
+
     /* after this, invalidate the drop_target's drag widget */
     drop_target->SetDragWidget( (GtkWidget*) NULL );
     /* after this, invalidate the drop_target's drag widget */
     drop_target->SetDragWidget( (GtkWidget*) NULL );
-    
+
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = TRUE;
     /* this has to be done because GDK has no "drag_enter" event */
     drop_target->m_firstMotion = TRUE;
-    
+
     return ret;
 }
 
     return ret;
 }
 
@@ -254,43 +284,55 @@ static gboolean target_drag_drop( GtkWidget *widget,
 // ----------------------------------------------------------------------------
 
 static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 // ----------------------------------------------------------------------------
 
 static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
-                                      GdkDragContext *context,
-                                      gint x,
-                                      gint y,
-                                      GtkSelectionData *data,
-                                      guint WXUNUSED(info),
-                                      guint time,
-                                      wxDropTarget *drop_target )
+                                       GdkDragContext *context,
+                                       gint x,
+                                       gint y,
+                                       GtkSelectionData *data,
+                                       guint WXUNUSED(info),
+                                       guint time,
+                                       wxDropTarget *drop_target )
 {
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     /* Owen Taylor: "call gtk_drag_finish() with
        success == TRUE" */
 
     /* 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);
-       
-       return;
+
+        return;
     }
     }
-    
+
+    wxLogDebug( 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;
+    if ( context->suggested_action == GDK_ACTION_COPY )
+        result = wxDragCopy;
+    else
+        result = wxDragMove;
+
+    if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
     {
-       /* tell GTK that data transfer was successfull */
+        wxLogDebug( wxT( "Drop target: OnData returned TRUE") );
+
+        /* tell GTK that data transfer was successfull */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
-       /* tell GTK that data transfer was not successfull */
+        wxLogDebug( wxT( "Drop target: OnData returned FALSE") );
+
+        /* tell GTK that data transfer was not successfull */
         gtk_drag_finish( context, FALSE, FALSE, time );
     }
         gtk_drag_finish( context, FALSE, FALSE, time );
     }
-    
+
     /* after this, invalidate the drop_target's drag data */
     drop_target->SetDragData( (GtkSelectionData*) NULL );
 }
     /* after this, invalidate the drop_target's drag data */
     drop_target->SetDragData( (GtkSelectionData*) NULL );
 }
@@ -299,7 +341,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;
@@ -308,463 +351,414 @@ 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( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
 {
-    return TRUE;
-}
+    if (!m_dataObject)
+        return FALSE;
 
 
-bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return FALSE;
+    return (GetMatchingPair() != (GdkAtom) 0);
 }
 
 }
 
-bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
+wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                   wxDragResult def )
 {
 {
-    return FALSE;
+    if (!m_dataObject)
+        return wxDragNone;
+
+    if (GetMatchingPair() == (GdkAtom) 0)
+        return wxDragNone;
+
+    return GetData() ? def : wxDragNone;
 }
 
 }
 
-bool wxDropTarget::RequestData( wxDataFormat format )
+GdkAtom wxDropTarget::GetMatchingPair()
 {
 {
-    if (!m_dragContext) return FALSE;
-    if (!m_dragWidget) return FALSE;
-    
-    /* this should trigger an "drag_data_received" event */
-    gtk_drag_get_data( m_dragWidget, 
-                      m_dragContext,
-                      format.GetAtom(),
-                      m_dragTime );
-                      
-    return TRUE;
-}
+    if (!m_dataObject)
+        return (GdkAtom) 0;
+
+    if (!m_dragContext)
+        return (GdkAtom) 0;
 
 
-bool wxDropTarget::IsSupported( wxDataFormat format )
-{ 
-    if (!m_dragContext) return FALSE;
-    
     GList *child = m_dragContext->targets;
     while (child)
     {
         GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
     GList *child = m_dragContext->targets;
     while (child)
     {
         GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
-  
-//        char *name = gdk_atom_name( formatAtom );
-//        if (name) printf( "Format available: %s.\n", name );
-  
-        if (formatAtom == format.GetAtom()) return TRUE;
+        wxDataFormat format( formatAtom );
+
+#ifdef __WXDEBUG__
+        wxLogDebug( wxT("Drop target: drag has format: %s"), format.GetId().c_str() );
+#endif // Debug
+
+        if (m_dataObject->IsSupportedFormat( format ))
+            return formatAtom;
+
         child = child->next;
     }
 
         child = child->next;
     }
 
-    return FALSE;
+    return (GdkAtom) 0;
 }
 }
-  
-bool wxDropTarget::GetData( wxDataObject *data_object )
+
+bool wxDropTarget::GetData()
 {
 {
-    if (!m_dragData) return FALSE;
-    
-    if (m_dragData->target !=  data_object->GetFormat().GetAtom()) return FALSE;
-       
-    if (data_object->GetFormat().GetType() == wxDF_TEXT)
-    {
-        wxTextDataObject *text_object = (wxTextDataObject*)data_object;
-        text_object->SetText( (const char*)m_dragData->data );
-    } else
-       
-    if (data_object->GetFormat().GetType() == wxDF_FILENAME)
-    {
-    } else
-       
-    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 );
-    }
-    
+    if (!m_dragData)
+        return FALSE;
+
+    if (!m_dataObject)
+        return FALSE;
+
+    wxDataFormat dragFormat( m_dragData->target );
+
+    if (!m_dataObject->IsSupportedFormat( dragFormat ))
+        return FALSE;
+
+    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_disconnect_by_func( GTK_OBJECT(widget),
-                     GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                     GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                     GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                     GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
 }
 
 void wxDropTarget::RegisterWidget( GtkWidget *widget )
 {
 }
 
 void wxDropTarget::RegisterWidget( GtkWidget *widget )
 {
-    wxCHECK_RET( widget != NULL, _T("register widget is NULL") );
-  
+    wxCHECK_RET( widget != NULL, wxT("register widget is NULL") );
+
     /* gtk_drag_dest_set() determines what default behaviour we'd like
        GTK to supply. we don't want to specify out targets (=formats)
        or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and
        not GTK_DEST_DEFAULT_DROP). instead we react individually to
        "drag_motion" and "drag_drop" events. this makes it possible
     /* gtk_drag_dest_set() determines what default behaviour we'd like
        GTK to supply. we don't want to specify out targets (=formats)
        or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and
        not GTK_DEST_DEFAULT_DROP). instead we react individually to
        "drag_motion" and "drag_drop" events. this makes it possible
-       to allow dropping on only a small area. we should set 
+       to allow dropping on only a small area. we should set
        GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice
        highlighting if dragging over standard controls, but this
        seems to be broken without the other two. */
        GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice
        highlighting if dragging over standard controls, but this
        seems to be broken without the other two. */
-  
+
     gtk_drag_dest_set( widget,
     gtk_drag_dest_set( widget,
-                      (GtkDestDefaults) 0,         /* no default behaviour */
-                      (GtkTargetEntry*) NULL,      /* we don't supply any formats here */
-                      0,                           /* number of targets = 0 */
-                      (GdkDragAction) 0 );         /* we don't supply any actions here */
-                    
+                       (GtkDestDefaults) 0,         /* no default behaviour */
+                       (GtkTargetEntry*) NULL,      /* we don't supply any formats here */
+                       0,                           /* number of targets = 0 */
+                       (GdkDragAction) 0 );         /* we don't supply any actions here */
+
     gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",
     gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",
-                     GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
-                     GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
-                     GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
-                     GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
-}
-
-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
-
-bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return IsSupported( wxDF_TEXT );
+                      GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
 }
 
 }
 
-bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    if (IsSupported( wxDF_TEXT ))
-    {
-        RequestData( wxDF_TEXT );
-       return TRUE;
-    }
-    
-    return FALSE;
-}
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------
 
 
-bool wxTextDropTarget::OnData( int x, int 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() );
-    
-    return TRUE;
-}
+    if (g_isIdle) wxapp_install_idle_handler();
 
 
-//-------------------------------------------------------------------------
-// wxPrivateDropTarget
-//-------------------------------------------------------------------------
+    wxDataFormat format( selection_data->target );
 
 
-wxPrivateDropTarget::wxPrivateDropTarget()
-{
-    m_id = wxTheApp->GetAppName();
-}
+    wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() );
 
 
-wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id )
-{
-    m_id = id;
-}
+    drop_source->m_retValue = wxDragCancel;
 
 
-bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return IsSupported( m_id );
-}
+    wxDataObject *data = drop_source->GetDataObject();
 
 
-bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    if (!IsSupported( m_id ))
-    { 
-        RequestData( m_id );
-        return FALSE;
+    if (!data)
+    {
+        wxLogDebug( wxT("Drop source: no data object") );
+        return;
     }
     }
-    
-    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 ))
+    if (!data->IsSupportedFormat(format))
     {
     {
-        RequestData( wxDF_FILENAME );
-       return TRUE;
+        wxLogDebug( wxT("Drop source: unsupported format") );
+        return;
     }
     }
-    
-    return FALSE;
-}
 
 
-bool wxFileDropTarget::OnData( int x, int y )
-{
-    wxFileDataObject data;
-    if (!GetData( &data )) return FALSE;
-
-    /* get number of substrings /root/mytext.txt/0/root/myothertext.txt/0/0 */
-    size_t number = 0;
-    size_t i;
-    size_t size = data.GetFiles().Length();
-    wxChar *text = WXSTRINGCAST data.GetFiles();
-    for ( i = 0; i < size; i++)
-        if (text[i] == 0) number++;
-
-    if (number == 0) return FALSE;
-    
-    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;
+        wxLogDebug( wxT("Drop source: empty data") );
+        return;
     }
 
     }
 
-    OnDropFiles( x, y, number, files ); 
-  
-    free( files );
-    
-    return TRUE;
-}
+    size_t size = data->GetDataSize(format);
 
 
-//----------------------------------------------------------------------------
-// "drag_data_get"
-//----------------------------------------------------------------------------
+//  printf( "data size: %d.\n", (int)data_size );
 
 
-static void  
-source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
-                      GdkDragContext     *context,
-                      GtkSelectionData   *selection_data,
-                      guint               WXUNUSED(info),
-                      guint               WXUNUSED(time),
-                      wxDropSource       *drop_source )
-{
-//    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)
+    guchar *d = new guchar[size];
+
+    if (!data->GetDataHere( format, (void*)d ))
     {
     {
-        wxDataObject *data_object = (wxDataObject*) node->Data();
-       if (data_object->GetFormat().GetAtom() == selection_data->target)
-       {
-           size_t data_size = data_object->GetSize();
-           
-           if (data_size > 0)
-           {
-               guchar *buffer = new guchar[data_size];
-               data_object->WriteData( buffer );
-               
-                gtk_selection_data_set( selection_data,
-                                       selection_data->target,
-                                       8,   /* 8-bit */
-                                       buffer, 
-                                       data_size );
-                                       
-               free( buffer );
-               
-               /* so far only copy, no moves. TODO. */
-                drop_source->m_retValue = wxDragCopy;
-           
-               return;
-           }
-       }
-    
-        node = node->Next();
+        delete[] d;
+        return;
     }
     }
-    
-    drop_source->m_retValue = wxDragCancel;
+
+#if wxUSE_THREADS
+    /* disable GUI threads */
+    wxapp_uninstall_thread_wakeup();
+#endif
+
+                gtk_selection_data_set( selection_data,
+                                        selection_data->target,
+                                        8,   // 8-bit
+                                        d,
+                                        size );
+
+#if wxUSE_THREADS
+    /* enable GUI threads */
+    wxapp_install_thread_wakeup();
+#endif
+
+    delete[] d;
 }
 }
-  
+
 //----------------------------------------------------------------------------
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 
 static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
 //----------------------------------------------------------------------------
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 
 static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
-                                    GdkDragContext     *WXUNUSED(context),
-                                    wxDropSource       *drop_source )
+                                     GdkDragContext     *WXUNUSED(context),
+                                     wxDropSource       *WXUNUSED(drop_source) )
 {
 {
-//    printf( "Delete the data!\n" );
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
 
-    drop_source->m_retValue = wxDragMove;
+    // printf( "Drag source: drag_data_delete\n" );
 }
 }
-  
+
 //----------------------------------------------------------------------------
 // "drag_begin"
 //----------------------------------------------------------------------------
 
 static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
 //----------------------------------------------------------------------------
 // "drag_begin"
 //----------------------------------------------------------------------------
 
 static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
-                              GdkDragContext     *WXUNUSED(context),
-                              wxDropSource       *WXUNUSED(drop_source) )
+                               GdkDragContext     *WXUNUSED(context),
+                               wxDropSource       *WXUNUSED(drop_source) )
 {
 {
-//    printf( "drag_begin.\n" );
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    // printf( "Drag source: drag_begin.\n" );
 }
 }
-  
+
 //----------------------------------------------------------------------------
 // "drag_end"
 //----------------------------------------------------------------------------
 
 static void source_drag_end( GtkWidget          *WXUNUSED(widget),
 //----------------------------------------------------------------------------
 // "drag_end"
 //----------------------------------------------------------------------------
 
 static void source_drag_end( GtkWidget          *WXUNUSED(widget),
-                            GdkDragContext     *WXUNUSED(context),
-                            wxDropSource       *drop_source )
+                             GdkDragContext     *WXUNUSED(context),
+                             wxDropSource       *drop_source )
 {
 {
-//    printf( "drag_end.\n" );
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    // 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();
+
+    wxDragResult action = wxDragNone;
+    if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
+    if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
+
+    source->GiveFeedback( 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;
     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_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_data = data;
+    m_iconCopy = iconCopy;
+    m_iconMove = iconMove;
+    m_iconNone = iconNone;
 
 
-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    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;
 }
 
 }
 
-void wxDropSource::SetData( wxDataObject *data )
+wxDropSource::~wxDropSource()
 {
 {
-    if (m_data) delete m_data;
-    
-    if (data)
-    {
-        m_data = new wxDataBroker();
-       m_data->Add( data );
-    }
-    else
-    {
-        m_data = (wxDataBroker*) NULL;
-    }
 }
 
 }
 
-void wxDropSource::SetData( wxDataBroker *data )
+void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
 {
 {
-    if (m_data) delete m_data;
-    
-    m_data = 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);
+
+    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 );
 }
 
 }
 
-wxDropSource::~wxDropSource(void)
+wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 {
 {
-    if (m_data) delete m_data;
+    wxASSERT_MSG( m_data, wxT("Drop source: no data") );
 
 
+    if (!m_data)
+        return (wxDragResult) wxDragNone;
+
+    if (m_data->GetFormatCount() == 0)
+        return (wxDragResult) wxDragNone;
+
+    // disabled for now
     g_blockEventsOnDrag = FALSE;
     g_blockEventsOnDrag = FALSE;
-}
-   
-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
-{
-    wxASSERT_MSG( m_data, _T("wxDragSource: no data") );
-  
-    if (!m_data) return (wxDragResult) wxDragNone;
-  
-    g_blockEventsOnDrag = TRUE;
-  
+
     RegisterWindow();
     RegisterWindow();
-    
+
     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 );
-    gtk_target_list_add( target_list, gdk_atom_intern( "STRING", FALSE ), 0, 0 );
-    
+
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
+    {
+        GdkAtom atom = array[i];
+        wxLogDebug( 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;
     int x = 0;
     GdkEventMotion event;
     event.window = m_widget->window;
     int x = 0;
@@ -774,41 +768,49 @@ 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 = (guint32)GDK_CURRENT_TIME;
+
     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;
     if (event.state & GDK_BUTTON1_MASK) button_number = 1;
     else if (event.state & GDK_BUTTON2_MASK) button_number = 2;
     else if (event.state & GDK_BUTTON3_MASK) button_number = 3;
 
     /* GTK wants to know which button was pressed which caused the dragging */
     int button_number = 0;
     if (event.state & GDK_BUTTON1_MASK) button_number = 1;
     else if (event.state & GDK_BUTTON2_MASK) button_number = 2;
     else if (event.state & GDK_BUTTON3_MASK) button_number = 3;
 
+#if wxUSE_THREADS
+    /* disable GUI threads */
+    wxapp_uninstall_thread_wakeup();
+#endif
+
     /* don't start dragging if no button is down */
     if (button_number)
     {
     /* don't start dragging if no button is down */
     if (button_number)
     {
+        GdkDragAction action = GDK_ACTION_COPY;
+        if (allowMove) action = (GdkDragAction)(GDK_ACTION_MOVE|GDK_ACTION_COPY);
         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 );
-    
-        gdk_flush();
-    
-        while (m_waiting) wxYield();
+                target_list,
+                action,
+                button_number,  /* number of mouse button which started drag */
+                (GdkEvent*) &event );
+
+        m_dragContext = context;
+
+        PrepareIcon( action, context );
+
+        while (m_waiting) gtk_main_iteration();
+
+        if (context->action == GDK_ACTION_COPY)
+            m_retValue = wxDragCopy;
+        if (context->action == GDK_ACTION_MOVE)
+            m_retValue = wxDragMove;
     }
 
     }
 
+#if wxUSE_THREADS
+    /* re-enable GUI threads */
+    wxapp_install_thread_wakeup();
+#endif
+
     g_blockEventsOnDrag = FALSE;
     g_blockEventsOnDrag = FALSE;
-    
+
     UnregisterWindow();
 
     return m_retValue;
     UnregisterWindow();
 
     return m_retValue;
@@ -817,32 +819,31 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 void wxDropSource::RegisterWindow()
 {
     if (!m_widget) return;
 void wxDropSource::RegisterWindow()
 {
     if (!m_widget) return;
-    
+
     gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
     gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
-                     GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this);
+                      GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this);
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",
-                     GTK_SIGNAL_FUNC (source_drag_data_delete),  (gpointer) this );
+                      GTK_SIGNAL_FUNC (source_drag_data_delete),  (gpointer) this );
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_begin",
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_begin",
-                     GTK_SIGNAL_FUNC (source_drag_begin),  (gpointer) this );
+                      GTK_SIGNAL_FUNC (source_drag_begin),  (gpointer) this );
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end",
     gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end",
-                     GTK_SIGNAL_FUNC (source_drag_end),  (gpointer) this );
+                      GTK_SIGNAL_FUNC (source_drag_end),  (gpointer) this );
 
 }
 
 void wxDropSource::UnregisterWindow()
 {
     if (!m_widget) return;
 
 }
 
 void wxDropSource::UnregisterWindow()
 {
     if (!m_widget) return;
-    
+
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                     GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this );
+                      GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this );
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                     GTK_SIGNAL_FUNC(source_drag_data_delete), (gpointer) this );
+                      GTK_SIGNAL_FUNC(source_drag_data_delete), (gpointer) this );
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                     GTK_SIGNAL_FUNC(source_drag_begin), (gpointer) this );
+                      GTK_SIGNAL_FUNC(source_drag_begin), (gpointer) this );
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                     GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this );
+                      GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this );
 }
 
 #endif
 }
 
 #endif
-
       // wxUSE_DRAG_AND_DROP
       // wxUSE_DRAG_AND_DROP
wxWidgets (Impactor)