]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk1/dnd.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
merged MapBitmap() from 2.2 branch
[wxWidgets.git] / src / gtk1 / dnd.cpp
diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 00f4e0d90ab246f3190b35240bc29f609d1f320d..fdfeb4fade71e69a732008e29b9ec544ea9f1c9a 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/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,11 +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 <X11/Xlib.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
@@ -33,61 +50,25 @@
 
 extern bool g_blockEventsOnDrag;
 
 
 extern bool g_blockEventsOnDrag;
 
+// the trace mask we use with wxLogTrace() - call
+// wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here
+// (there are quite a few of them, so don't enable this by default)
+static const wxChar *TRACE_DND = _T("dnd");
+
 //----------------------------------------------------------------------------
 // standard icons
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
 // 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..        ",
@@ -121,33 +102,31 @@ static char * page_xpm[] = {
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .........................   "};
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
 "    .........................   "};
-                             
-                             
-#if (GTK_MINOR_VERSION > 0)
 
 
-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+
 
 // ----------------------------------------------------------------------------
 // "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 );
 }
@@ -157,41 +136,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;
 }
 
@@ -200,61 +195,97 @@ 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()" */
     /* 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;
+*/
+
+    /* 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 );
     bool ret = drop_target->OnDrop( x, y );
-    
-    if (ret)
+
+    if (!ret)
     {
     {
-        /* this should trigger an "drag_data_received" event */
-        gtk_drag_get_data( widget, 
-                          context, 
-                          GPOINTER_TO_INT (context->targets->data), 
-                          time );
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );
+
+        /* cancel the whole thing */
+        gtk_drag_finish( context,
+                          FALSE,        /* no success */
+                          FALSE,        /* don't delete data on dropping side */
+                          time );
     }
     else
     {
     }
     else
     {
-        /* cancel the whole thing */
-        gtk_drag_finish( context,
-                         FALSE,        /* no success */
-                         FALSE,        /* don't delete data on dropping side */
-                         time );
+        wxLogTrace(TRACE_DND, 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;
 }
 
@@ -263,1136 +294,572 @@ 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" */
 
-    /* strangely, we get a "drag_data_received" event even when
-       we don't request them. this checks this. */
-    if (!drop_target->m_currentDataObject) return;
-    
-    wxDataObject *data_object = drop_target->m_currentDataObject;
-
     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;
     }
     }
+
+    wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") );
+
+    /* inform the wxDropTarget about the current GtkSelectionData.
+       this is only valid for the duration of this call */
+    drop_target->SetDragData( data );
+
+    wxDragResult result;
+    if ( context->suggested_action == GDK_ACTION_COPY )
+        result = wxDragCopy;
     else
     else
+        result = wxDragMove;
+
+    if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
     {
-        wxASSERT_MSG( data->target ==  data_object->GetFormat().GetAtom(), "DnD GetData target mismatch."  );
-       
-       if (data_object->GetFormat().GetType() == wxDF_TEXT)
-       {
-           wxTextDataObject *text_object = (wxTextDataObject*)data_object;
-           text_object->SetText( (const char*)data->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*)data->data, (size_t)data->length );
-       }
-       
-       /* tell wxDropTarget that data transfer was successfull */
-       drop_target->m_dataRetrieveSuccess = TRUE;
-       
-       /* tell GTK that data transfer was successfull */
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") );
+
+        /* tell GTK that data transfer was successfull */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
+    else
+    {
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );
 
 
-    /* tell wxDropTarget that data has arrived (or not) */
-    drop_target->m_waiting = FALSE;
+        /* tell GTK that data transfer was not successfull */
+        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_dragContext = (GdkDragContext*) NULL;
     m_dragWidget = (GtkWidget*) NULL;
 {
     m_firstMotion = TRUE;
     m_dragContext = (GdkDragContext*) NULL;
     m_dragWidget = (GtkWidget*) NULL;
+    m_dragData = (GtkSelectionData*) NULL;
     m_dragTime = 0;
     m_dragTime = 0;
-    m_currentDataObject = (wxDataObject*) NULL;
-    m_dataRetrieveSuccess = FALSE;
 }
 
 }
 
-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
+
+    return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;
 }
 
 }
 
-void wxDropTarget::OnLeave()
+bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
 {
+    if (!m_dataObject)
+        return FALSE;
+
+    return (GetMatchingPair() != (GdkAtom) 0);
 }
 
 }
 
-bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
+wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                   wxDragResult def )
 {
 {
-    return TRUE;
+    if (!m_dataObject)
+        return wxDragNone;
+
+    if (GetMatchingPair() == (GdkAtom) 0)
+        return wxDragNone;
+
+    return GetData() ? def : wxDragNone;
 }
 
 }
 
-bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
+GdkAtom wxDropTarget::GetMatchingPair()
 {
 {
-    return FALSE;
-}
+    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__
+        wxLogTrace(TRACE_DND, 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 )
+
+bool wxDropTarget::GetData()
 {
 {
-    if (!m_dragContext) return FALSE;
-    if (!m_dragWidget) return FALSE;
-    
-    m_currentDataObject = data;
-    m_dataRetrieveSuccess = FALSE;
-    
-    /* this should trigger an "drag_data_received" event */
-    gtk_drag_get_data( m_dragWidget, 
-                      m_dragContext,
-                      data->GetFormat().GetAtom(),
-                      m_dragTime );
-                      
-    /* wait for the "drag_data_received" event */
-    m_waiting = TRUE;
-    while (m_waiting) gtk_main_iteration();
-    
-    m_currentDataObject = (wxDataObject*) NULL;
-    
-    return m_dataRetrieveSuccess;
+    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;
 }
 }
-  
+
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 {
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 {
-    wxCHECK_RET( widget != NULL, "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, "register widget is NULL" );
-  
+    wxCHECK_RET( widget != NULL, wxT("register widget is NULL") );
+
     /* gtk_drag_dest_set() determines what default behaviour we'd like
        GTK to supply. we don't want to specify out targets (=formats)
        or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and
        not GTK_DEST_DEFAULT_DROP). instead we react individually to
        "drag_motion" and "drag_drop" events. this makes it possible
     /* gtk_drag_dest_set() determines what default behaviour we'd like
        GTK to supply. we don't want to specify out targets (=formats)
        or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and
        not GTK_DEST_DEFAULT_DROP). instead we react individually to
        "drag_motion" and "drag_drop" events. this makes it possible
-       to allow dropping on only a small area. we should set 
+       to allow dropping on only a small area. we should set
        GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice
        highlighting if dragging over standard controls, but this
        seems to be broken without the other two. */
        GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice
        highlighting if dragging over standard controls, but this
        seems to be broken without the other two. */
-  
+
     gtk_drag_dest_set( widget,
     gtk_drag_dest_set( widget,
-                      (GtkDestDefaults) 0,         /* no default behaviour */
-                      (GtkTargetEntry*) NULL,      /* we don't supply any formats here */
-                      0,                           /* number of targets = 0 */
-                      (GdkDragAction) 0 );         /* we don't supply any actions here */
-                    
+                       (GtkDestDefaults) 0,         /* no default behaviour */
+                       (GtkTargetEntry*) NULL,      /* we don't supply any formats here */
+                       0,                           /* number of targets = 0 */
+                       (GdkDragAction) 0 );         /* we don't supply any actions here */
+
     gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",
     gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",
-                     GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
-                     GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
-                     GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
 
     gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
-                     GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
+                      GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
 }
 
 }
 
-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
-
-bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return IsSupported( wxDF_TEXT );  // same as "STRING"
-}
-
-bool wxTextDropTarget::OnDrop( int x, int y )
-{
-    if (!IsSupported( wxDF_TEXT )) return FALSE;
-    
-    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;
-}
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------
 
 
-bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(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 )
 {
 {
-    return IsSupported( m_id );
-}
+    if (g_isIdle) wxapp_install_idle_handler();
 
 
-bool wxPrivateDropTarget::OnDrop( 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;
-}
+    wxDataFormat format( selection_data->target );
 
 
-//----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-//----------------------------------------------------------------------------
+    wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
+               format.GetId().c_str());
 
 
-bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
-    return IsSupported( wxDF_FILENAME );  // same as "file:ALL"
-}
+    drop_source->m_retValue = wxDragCancel;
 
 
-bool wxFileDropTarget::OnDrop( int x, int y )
-{
-    return IsSupported( wxDF_FILENAME );  // same as "file:ALL"
-}
+    wxDataObject *data = drop_source->GetDataObject();
 
 
-void wxFileDropTarget::OnData( int x, int y )
-{
-    wxFileDataObject data;
-    if (!GetData( &data )) return;
-
-    /* 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();
-    char *text = WXSTRINGCAST data.GetFiles();
-    for ( i = 0; i < size; i++)
-        if (text[i] == 0) number++;
-
-    if (number == 0) return;
-    
-    char **files = new char*[number];
-  
-    text = WXSTRINGCAST data.GetFiles();
-    for (i = 0; i < number; i++)
+    if (!data)
     {
     {
-        files[i] = text;
-        int len = strlen( text );
-        text += len+1;
+        wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );
+        return;
     }
 
     }
 
-    OnDropFiles( x, y, number, files ); 
-  
-    free( files );
-}
+    if (!data->IsSupportedFormat(format))
+    {
+        wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );
+        return;
+    }
 
 
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
+    if (data->GetDataSize(format) == 0)
+    {
+        wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );
+        return;
+    }
 
 
+    size_t size = data->GetDataSize(format);
 
 
-wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
-{
-    g_blockEventsOnDrag = TRUE;
-  
-    m_window = win;
-    m_widget = win->m_widget;
-    if (win->m_wxwindow) m_widget = win->m_wxwindow;
-  
-    m_data = (wxDataBroker*) NULL;
-    m_retValue = wxDragCancel;
+//  printf( "data size: %d.\n", (int)data_size );
 
 
-    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 );
-}
+    guchar *d = new guchar[size];
 
 
-wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
-{
-    g_blockEventsOnDrag = TRUE;
-  
-    m_window = win;
-    m_widget = win->m_widget;
-    if (win->m_wxwindow) m_widget = win->m_wxwindow;
-    m_retValue = wxDragCancel;
-  
-    if (data)
+    if (!data->GetDataHere( format, (void*)d ))
     {
     {
-        m_data = new wxDataBroker();
-       m_data->Add( data );
-    }
-    else
-    {
-        m_data = (wxDataBroker*) NULL;
+        delete[] d;
+        return;
     }
 
     }
 
-    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 );
-}
+#if wxUSE_THREADS
+    /* disable GUI threads */
+    wxapp_uninstall_thread_wakeup();
+#endif
 
 
-wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
-{
-    g_blockEventsOnDrag = TRUE;
-  
-    m_window = win;
-    m_widget = win->m_widget;
-    if (win->m_wxwindow) m_widget = win->m_wxwindow;
-    m_retValue = wxDragCancel;
-  
-    m_data = data;
+                gtk_selection_data_set( selection_data,
+                                        selection_data->target,
+                                        8,   // 8-bit
+                                        d,
+                                        size );
 
 
-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-}
+#if wxUSE_THREADS
+    /* enable GUI threads */
+    wxapp_install_thread_wakeup();
+#endif
 
 
-void wxDropSource::SetData( wxDataObject *data )
-{
-    if (m_data) delete m_data;
-    
-    if (data)
-    {
-        m_data = new wxDataBroker();
-       m_data->Add( data );
-    }
-    else
-    {
-        m_data = (wxDataBroker*) NULL;
-    }
+    delete[] d;
 }
 
 }
 
-void wxDropSource::SetData( wxDataBroker *data )
-{
-    if (m_data) delete m_data;
-    
-    m_data = data;
-}
+//----------------------------------------------------------------------------
+// "drag_data_delete"
+//----------------------------------------------------------------------------
 
 
-wxDropSource::~wxDropSource(void)
+static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
+                                     GdkDragContext     *WXUNUSED(context),
+                                     wxDropSource       *WXUNUSED(drop_source) )
 {
 {
-    if (m_data) delete m_data;
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
 
-    g_blockEventsOnDrag = FALSE;
+    // printf( "Drag source: drag_data_delete\n" );
 }
 }
-   
-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
-{
-    wxASSERT_MSG( m_data, "wxDragSource: no data" );
-  
-    if (!m_data) return (wxDragResult) wxDragNone;
-  
-    static GtkWidget *drag_icon = (GtkWidget*) NULL;
-    static GtkWidget *drop_icon = (GtkWidget*) NULL;
-
-    GdkPoint hotspot_1 = {0,-5 };
-      
-    if (!drag_icon)
-    {
-/*
-         drag_icon = shape_create_icon ( m_stopIcon,
-                                        440, 140, 0,0, GTK_WINDOW_POPUP);
-         
-         gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy",
-                             GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                             &drag_icon);
-
-         gtk_widget_hide (drag_icon);
-*/
-    }
-      
-    GdkPoint hotspot_2 = {-5,-5};
-       
-    if (!drop_icon)
-    {
-/*
-         drop_icon = shape_create_icon ( m_goIcon,
-                                        440, 140, 0,0, GTK_WINDOW_POPUP);
-         
-         gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy",
-                             GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                             &drop_icon);
-
-         gtk_widget_hide (drop_icon);
-*/
-    }
-       
 
 
-    return FALSE;
-}
+//----------------------------------------------------------------------------
+// "drag_begin"
+//----------------------------------------------------------------------------
 
 
-void wxDropSource::RegisterWindow(void)
+static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
+                               GdkDragContext     *WXUNUSED(context),
+                               wxDropSource       *WXUNUSED(drop_source) )
 {
 {
-    if (!m_data) return;
-}
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
 
-void wxDropSource::UnregisterWindow(void)
-{
-    if (!m_widget) return;
+    // printf( "Drag source: drag_begin.\n" );
 }
 
 }
 
-
-#else  // NEW_CODE
-
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
-// forward
+// "drag_end"
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
 
-GtkWidget *shape_create_icon ( const wxIcon &shape,
-                             gint      x,
-                             gint      y,
-                             gint      px,
-                             gint      py,
-                             gint      window_type);
-
-//-----------------------------------------------------------------------------
-// globals
-//-----------------------------------------------------------------------------
+static void source_drag_end( GtkWidget          *WXUNUSED(widget),
+                             GdkDragContext     *WXUNUSED(context),
+                             wxDropSource       *drop_source )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
 
 
-wxDropSource *gs_currentDropSource = (wxDropSource*) NULL;
+    // printf( "Drag source: drag_end.\n" );
 
 
-//-----------------------------------------------------------------------------
-// "drop_enter_event"
-//-----------------------------------------------------------------------------
-
-static void gtk_target_enter_callback( GtkWidget *WXUNUSED(widget), 
-                                       GdkEventDropEnter *WXUNUSED(event), 
-                                      wxDropTarget *target )
-{
-    if (target)
-        target->OnEnter();
+    drop_source->m_waiting = FALSE;
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
-// "drop_leave_event"
+// "configure_event" from m_iconWindow
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 
-static void gtk_target_leave_callback( GtkWidget *WXUNUSED(widget), 
-                                       GdkEventDropLeave *WXUNUSED(event), 
-                                      wxDropTarget *target )
+static gint
+gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {
 {
-    if (target)
-        target->OnLeave();
-}
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
 
-//-----------------------------------------------------------------------------
-// "drop_data_available_event"
-//-----------------------------------------------------------------------------
+    wxDragResult action = wxDragNone;
+    if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
+    if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
 
 
-static void gtk_target_callback( GtkWidget *widget, 
-                                 GdkEventDropDataAvailable *event, 
-                                wxDropTarget *target )
-{
-    if (target)
-    {
-        int x = 0;
-        int y = 0;
-        gdk_window_get_pointer( widget->window, &x, &y, (GdkModifierType *) NULL );
-/*
-        printf( "Drop data is of type %s.\n", event->data_type );
-*/
-        target->OnDrop( x, y, (const void*)event->data, (size_t)event->data_numbytes );
-    }
+    source->GiveFeedback( action );
 
 
-/*
-    g_free (event->data);
-    g_free (event->data_type);
-*/
+    return 0;
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxDropTarget
-// ----------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// wxDropSource
+//---------------------------------------------------------------------------
 
 
-wxDropTarget::wxDropTarget()
+wxDropSource::wxDropSource(wxWindow *win,
+                           const wxIcon &iconCopy,
+                           const wxIcon &iconMove,
+                           const wxIcon &iconNone)
 {
 {
-    m_format = (wxDataFormat*) NULL;
-}
+    m_waiting = TRUE;
 
 
-wxDropTarget::~wxDropTarget()
-{
-    if (m_format) delete m_format;
-}
+    m_iconWindow = (GtkWidget*) NULL;
 
 
-wxDataFormat &wxDropTarget::GetFormat(size_t n) const
-{
-    return (*m_format);
-}
+    m_window = win;
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;
 
 
-void wxDropTarget::UnregisterWidget( GtkWidget *widget )
-{
-    if (!widget) return;
-  
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-      GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this );
+    m_retValue = wxDragCancel;
 
 
-    gtk_widget_dnd_drop_set( widget, FALSE, (gchar **) NULL, 0, FALSE );
+    SetIcons(iconCopy, iconMove, iconNone);
 }
 
 }
 
-void wxDropTarget::RegisterWidget( GtkWidget *widget )
+wxDropSource::wxDropSource(wxDataObject& data,
+                           wxWindow *win,
+                           const wxIcon &iconCopy,
+                           const wxIcon &iconMove,
+                           const wxIcon &iconNone)
 {
 {
-    wxString formats;
-    int valid = 0;
-  
-    for ( size_t i = 0; i < GetFormatCount(); i++ )
-    {
-        switch (GetFormat(i).GetType()) 
-        {
-            case wxDF_TEXT:
-           {
-               if (i > 0) formats += ";";
-                formats += "text/plain";
-               valid++;
-               break;
-           }
-            case wxDF_FILENAME:
-           {
-               if (i > 0) formats += ";";
-                formats += "file:ALL";
-               valid++;
-               break;
-           }
-            case wxDF_PRIVATE:
-           {
-               if (i > 0) formats += ";";
-                wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this;
-                formats += pdt->GetId();
-               valid++;
-               break;
-           }
-            default:
-              break;
-        }
-    }
-  
-    char *str = WXSTRINGCAST formats;
-    
-    gtk_widget_dnd_drop_set( widget, TRUE, &str, valid, FALSE );
-  
-    gtk_signal_connect( GTK_OBJECT(widget), "drop_data_available_event",
-      GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this );
-      
-    gtk_signal_connect( GTK_OBJECT(widget), "drop_enter_event",
-      GTK_SIGNAL_FUNC(gtk_target_enter_callback), (gpointer) this );
-      
-    gtk_signal_connect( GTK_OBJECT(widget), "drop_leave_event",
-      GTK_SIGNAL_FUNC(gtk_target_leave_callback), (gpointer) this );
-}
+    m_waiting = TRUE;
 
 
-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
+    SetData( data );
 
 
-wxTextDropTarget::wxTextDropTarget()
-{
-    m_format = new wxDataFormat( wxDF_TEXT );
-}
+    m_iconWindow = (GtkWidget*) NULL;
 
 
-bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
-{
-    OnDropText( x, y, (const char*)data );
-    return TRUE;
-}
+    m_window = win;
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;
 
 
-bool wxTextDropTarget::OnDropText( long x, long y, const char *psz )
-{
-/*
-    printf( "Got dropped text: %s.\n", psz );
-    printf( "At x: %d, y: %d.\n", (int)x, (int)y );
-*/
-    return TRUE;
-}
+    m_retValue = wxDragCancel;
 
 
-size_t wxTextDropTarget::GetFormatCount() const
-{
-    return 1;
+    SetIcons(iconCopy, iconMove, iconNone);
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxPrivateDropTarget
-// ----------------------------------------------------------------------------
-
-wxPrivateDropTarget::wxPrivateDropTarget()
+void wxDropSource::SetIcons(const wxIcon &iconCopy,
+                            const wxIcon &iconMove,
+                            const wxIcon &iconNone)
 {
 {
-    m_id = wxTheApp->GetAppName();
-    m_format = new wxDataFormat( m_id );
+    m_iconCopy = iconCopy;
+    m_iconMove = iconMove;
+    m_iconNone = iconNone;
+
+    if ( !m_iconCopy.Ok() )
+        m_iconCopy = wxIcon(page_xpm);
+    if ( !m_iconMove.Ok() )
+        m_iconMove = m_iconCopy;
+    if ( !m_iconNone.Ok() )
+        m_iconNone = m_iconCopy;
 }
 
 }
 
-void wxPrivateDropTarget::SetId( const wxString& id )
+wxDropSource::~wxDropSource()
 {
 {
-    m_id = id;
-    m_format->SetId( id );
 }
 
 }
 
-size_t wxPrivateDropTarget::GetFormatCount() const
+void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
 {
 {
-    return 1;
-}
+    // 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;
 
 
-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
+    GdkBitmap *mask;
+    if ( icon->GetMask() )
+        mask = icon->GetMask()->GetBitmap();
+    else
+        mask = (GdkBitmap *)NULL;
 
 
-wxFileDropTarget::wxFileDropTarget()
-{
-    m_format = new wxDataFormat( wxDF_FILENAME );
-}    
+    GdkPixmap *pixmap = icon->GetPixmap();
 
 
-bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] )
-{
-    printf( "Got %d dropped files.\n", (int)nFiles );
-    printf( "At x: %d, y: %d.\n", (int)x, (int)y );
+    gint width,height;
+    gdk_window_get_size (pixmap, &width, &height);
 
 
-    for (size_t i = 0; i < nFiles; i++)
-    {
-        printf( aszFiles[i] );
-        printf( "\n" );
-    }
-    
-    return TRUE;
-}
+    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);
 
 
-bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
-{
-    size_t number = 0;
-    size_t i;
-    char *text = (char*) data;
-    for ( i = 0; i < size; i++)
-        if (text[i] == 0) number++;
-
-    if (number == 0) return TRUE;    
-    
-    char **files = new char*[number];
-  
-    text = (char*) data;
-    for (i = 0; i < number; i++)
-    {
-        files[i] = text;
-        int len = strlen( text );
-        text += len+1;
-    }
+    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);
 
 
-    bool ret = OnDropFiles( x, y, 1, files ); 
-  
-    free( files );
-  
-    return ret;
-}
+#ifndef __WXGTK20__
+    gtk_widget_pop_visual ();
+#endif
+    gtk_widget_pop_colormap ();
 
 
-size_t wxFileDropTarget::GetFormatCount() const
-{
-    return 1;
-}
+    gtk_widget_set_usize (m_iconWindow, width, height);
+    gtk_widget_realize (m_iconWindow);
 
 
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
+    gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event",
+        GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this );
 
 
-static void
-shape_motion (GtkWidget      *widget, 
-             GdkEventMotion * /*event*/);
-             
-//-----------------------------------------------------------------------------
-// "drag_request_event"
-//-----------------------------------------------------------------------------
+    gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE);
 
 
-void gtk_drag_callback( GtkWidget *widget, GdkEventDragRequest *event, wxDropSource *source )
-{
-    wxDataBroker *data = source->m_data;
-    
-    if (!data) return;
-    
-    wxNode *node = data->m_dataObjects.First();
-    {
-        wxDataObject *dobj = (wxDataObject*) node->Data();
-       
-       if ((strcmp(event->data_type,"file:ALL") == 0) &&
-           (dobj->GetFormat().GetType() == wxDF_FILENAME))
-       {
-           wxFileDataObject *file_object = (wxFileDataObject*) dobj;
-           
-           wxString text = file_object->GetFiles();
-           
-           char *s = WXSTRINGCAST text;
-           
-            gtk_widget_dnd_data_set( widget, 
-                                    (GdkEvent*)event, 
-                                    (unsigned char*) s, 
-                                    (int) text.Length()+1 );
-       
-            source->m_retValue = wxDragCopy;
-           
-           return;
-       }
-       
-       if ((strcmp(event->data_type,"text/plain") == 0) &&
-           (dobj->GetFormat().GetType() == wxDF_TEXT))
-       {
-           wxTextDataObject *text_object = (wxTextDataObject*) dobj;
-           
-           wxString text = text_object->GetText();
-           
-           char *s = WXSTRINGCAST text;
-           
-            gtk_widget_dnd_data_set( widget, 
-                                    (GdkEvent*)event, 
-                                    (unsigned char*) s, 
-                                    (int) text.Length()+1 );
-       
-            source->m_retValue = wxDragCopy;
-           
-           return;
-       }
-       
-       if (dobj->GetFormat().GetType() == wxDF_PRIVATE)
-       {
-            wxPrivateDataObject *pdo = (wxPrivateDataObject*) dobj;
-           
-           if (pdo->GetId() == event->data_type)
-           {
-                gtk_widget_dnd_data_set( widget, 
-                                    (GdkEvent*)event,
-                                    (unsigned char*) pdo->GetData(), 
-                                    (int) pdo->GetSize() );
-                                    
-                source->m_retValue = wxDragCopy;
-           
-               return;
-           }
-       }
-       
-       node = node->Next();
-   }
+    if (mask)
+        gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0);
+
+    gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 );
 }
 
 }
 
-wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
+wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 {
 {
-    g_blockEventsOnDrag = TRUE;
-  
-    m_window = win;
-    m_widget = win->m_widget;
-    if (win->m_wxwindow) m_widget = win->m_wxwindow;
-  
-    m_data = (wxDataBroker*) NULL;
-    m_retValue = wxDragCancel;
+    wxASSERT_MSG( m_data, wxT("Drop source: no data") );
 
 
-    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 );
-}
+    if (!m_data)
+        return (wxDragResult) wxDragNone;
 
 
-wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
-{
-    g_blockEventsOnDrag = TRUE;
-  
-    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;
-    }
+    if (m_data->GetFormatCount() == 0)
+        return (wxDragResult) wxDragNone;
 
 
-    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 );
-}
+    // still in drag
+    if (g_blockEventsOnDrag)
+        return (wxDragResult) wxDragNone;
 
 
-wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
-{
+    // disabled for now
     g_blockEventsOnDrag = TRUE;
     g_blockEventsOnDrag = TRUE;
-  
-    m_window = win;
-    m_widget = win->m_widget;
-    if (win->m_wxwindow) m_widget = win->m_wxwindow;
-    m_retValue = wxDragCancel;
-  
-    m_data = data;
-
-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-}
 
 
-void wxDropSource::SetData( wxDataObject *data )
-{
-    if (m_data) delete m_data;
-    
-    if (data)
-    {
-        m_data = new wxDataBroker();
-       m_data->Add( data );
-    }
-    else
-    {
-        m_data = (wxDataBroker*) NULL;
-    }
-}
+    RegisterWindow();
 
 
-void wxDropSource::SetData( wxDataBroker *data )
-{
-    if (m_data) delete m_data;
-    
-    m_data = data;
-}
+    m_waiting = TRUE;
 
 
-wxDropSource::~wxDropSource(void)
-{
-    if (m_data) delete m_data;
+    GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
 
 
-    g_blockEventsOnDrag = FALSE;
-}
-   
-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
-{
-    if (gdk_dnd.dnd_grabbed) return (wxDragResult) wxDragNone;
-    if (gdk_dnd.drag_really) return (wxDragResult) wxDragNone;
-  
-    wxASSERT_MSG( m_data, "wxDragSource: no data" );
-  
-    if (!m_data) return (wxDragResult) wxDragNone;
-  
-    static GtkWidget *drag_icon = (GtkWidget*) NULL;
-    static GtkWidget *drop_icon = (GtkWidget*) NULL;
-
-    GdkPoint hotspot_1 = {0,-5 };
-      
-    if (!drag_icon)
-    {
-         drag_icon = shape_create_icon ( m_stopIcon,
-                                        440, 140, 0,0, GTK_WINDOW_POPUP);
-         
-         gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy",
-                             GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                             &drag_icon);
-
-         gtk_widget_hide (drag_icon);
-    }
-      
-    GdkPoint hotspot_2 = {-5,-5};
-       
-    if (!drop_icon)
-    {
-         drop_icon = shape_create_icon ( m_goIcon,
-                                        440, 140, 0,0, GTK_WINDOW_POPUP);
-         
-         gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy",
-                             GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                             &drop_icon);
-
-         gtk_widget_hide (drop_icon);
-    }
-       
-
-    gdk_dnd_set_drag_shape( drag_icon->window,
-                            &hotspot_1,
-                            drop_icon->window,
-                            &hotspot_2);
-  
-  
-    GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window;
-  
-    RegisterWindow();
-  
-    gdk_dnd.drag_perhaps = TRUE;
-
-    gdk_dnd.dnd_drag_start.x = 5;
-    gdk_dnd.dnd_drag_start.y = 5;
-    gdk_dnd.real_sw = wp;
-         
-    if (gdk_dnd.drag_startwindows)
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
     {
     {
-        g_free( gdk_dnd.drag_startwindows );
-        gdk_dnd.drag_startwindows = (GdkWindow **) NULL;
+        GdkAtom atom = array[i];
+        wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));
+        gtk_target_list_add( target_list, atom, 0, 0 );
     }
     }
-    gdk_dnd.drag_numwindows = gdk_dnd.drag_really = 0;
-  
-    XWindowAttributes dnd_winattr;
-    XGetWindowAttributes( gdk_display, wp->xwindow, &dnd_winattr );
-    wp->dnd_drag_savedeventmask = dnd_winattr.your_event_mask;
-  
-    gdk_dnd_drag_addwindow( m_widget->window );
-  
-    GdkEventDragBegin ev;
-    ev.type = GDK_DRAG_BEGIN;
-    ev.window = m_widget->window;
-    ev.u.allflags = 0;
-    ev.u.flags.protocol_version = DND_PROTOCOL_VERSION;
-  
-    gdk_event_put( (GdkEvent*)&ev );
-  
-    XGrabPointer( gdk_display, wp->xwindow, False, 
-                  ButtonMotionMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-                 GrabModeAsync, GrabModeAsync, gdk_root_window, None, CurrentTime );
-               
-    gdk_dnd_set_drag_cursors( m_defaultCursor.GetCursor(), m_goaheadCursor.GetCursor() );
-  
-    gdk_dnd.dnd_grabbed = TRUE;
-    gdk_dnd.drag_really = 1;
-  
+    delete[] array;
+
+    GdkEventMotion event;
+    event.window = m_widget->window;
     int x = 0;
     int y = 0;
     int x = 0;
     int y = 0;
-    wxGetMousePosition( &x, &y );  
-  
-    gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE );
-    
-    gs_currentDropSource = this;
-    
-    while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield();
-    
-    gs_currentDropSource = (wxDropSource*) NULL;
-  
-    UnregisterWindow();
-  
-    g_blockEventsOnDrag = FALSE;
-  
-    return m_retValue;
-}
-
-void wxDropSource::RegisterWindow(void)
-{
-    if (!m_data) return;
+    GdkModifierType state;
+    gdk_window_get_pointer( event.window, &x, &y, &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;
+
+#if wxUSE_THREADS
+    /* disable GUI threads */
+    wxapp_uninstall_thread_wakeup();
+#endif
 
 
-    wxString formats;
-    
-    wxNode *node = m_data->m_dataObjects.First();
-    while (node)
+    /* don't start dragging if no button is down */
+    if (button_number)
     {
     {
-        wxDataObject* dobj = (wxDataObject*) node->Data();
-    
-        switch (dobj->GetFormat().GetType()) 
-        {
-            case wxDF_TEXT:
-           { 
-                  formats += "text/plain";
-                 break;
-           }
-            case wxDF_FILENAME:
-           {
-                  formats += "file:ALL";
-                 break;
-           }
-            case wxDF_PRIVATE:
-           {
-                 wxPrivateDataObject* pdo = (wxPrivateDataObject*) m_data;
-                 formats += pdo->GetId();
-                 break;
-           }
-            default:
-              break;
-       }
-       node = node->Next();
-    }
-  
-    char *str = WXSTRINGCAST formats;
-  
-    gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 );
+        GdkDragAction action = GDK_ACTION_COPY;
+        if (allowMove) action = (GdkDragAction)(GDK_ACTION_MOVE|GDK_ACTION_COPY);
+        GdkDragContext *context = gtk_drag_begin( m_widget,
+                target_list,
+                action,
+                button_number,  /* number of mouse button which started drag */
+                (GdkEvent*) &event );
 
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event",
-      GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this );
-}
+        m_dragContext = context;
 
 
-void wxDropSource::UnregisterWindow(void)
-{
-    if (!m_widget) return;
-  
-    gtk_widget_dnd_drag_set( m_widget, FALSE, (gchar **) NULL, 0 );
-  
-    gtk_signal_disconnect_by_data( GTK_OBJECT(m_widget), (gpointer)this );
-}
+        PrepareIcon( action, context );
 
 
+        while (m_waiting) gtk_main_iteration();
 
 
-/*
- * Shaped Windows
- */
-static GdkWindow *root_win = (GdkWindow*) NULL;
+        if (context->action == GDK_ACTION_COPY)
+            m_retValue = wxDragCopy;
+        if (context->action == GDK_ACTION_MOVE)
+            m_retValue = wxDragMove;
+    }
 
 
-typedef struct _cursoroffset {gint x,y;} CursorOffset;
+#if wxUSE_THREADS
+    /* re-enable GUI threads */
+    wxapp_install_thread_wakeup();
+#endif
 
 
-static void
-shape_pressed (GtkWidget *widget, GdkEventButton *event)
-{
-  CursorOffset *p;
-
-  /* ignore double and triple click */
-  if (event->type != GDK_BUTTON_PRESS)
-    return;
-
-  p = (CursorOffset *)gtk_object_get_user_data (GTK_OBJECT(widget));
-  p->x = (int) event->x;
-  p->y = (int) event->y;
-
-  gtk_grab_add (widget);
-  gdk_pointer_grab (widget->window, TRUE,
-                   (GdkEventMask)
-                     (GDK_BUTTON_RELEASE_MASK |
-                      GDK_BUTTON_MOTION_MASK |
-                      GDK_POINTER_MOTION_HINT_MASK),
-                   (GdkWindow*)NULL, 
-                   (GdkCursor*) NULL, 0);
-}
+    g_blockEventsOnDrag = FALSE;
 
 
+    UnregisterWindow();
 
 
-static void
-shape_released (GtkWidget *widget)
-{
-  gtk_grab_remove (widget);
-  gdk_pointer_ungrab (0);
+    return m_retValue;
 }
 
 }
 
-static void
-shape_motion (GtkWidget      *widget, 
-             GdkEventMotion * /*event*/ )
+void wxDropSource::RegisterWindow()
 {
 {
-  gint xp, yp;
-  CursorOffset * p;
-  GdkModifierType mask;
-
-  p = (CursorOffset *)gtk_object_get_user_data (GTK_OBJECT (widget));
-
-  /*
-   * Can't use event->x / event->y here 
-   * because I need absolute coordinates.
-   */
-   
-  gdk_window_get_pointer (root_win, &xp, &yp, &mask);
-  gtk_widget_set_uposition (widget, xp  - p->x, yp  - p->y);
-  
-  if (gs_currentDropSource) gs_currentDropSource->GiveFeedback( wxDragCopy, FALSE );
+    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 );
+
 }
 
 }
 
-GtkWidget *
-shape_create_icon (const wxIcon &shape,
-                  gint      x,
-                  gint      y,
-                  gint      px,
-                  gint      py,
-                  gint      window_type)
+void wxDropSource::UnregisterWindow()
 {
 {
-  /*
-   * GDK_WINDOW_TOPLEVEL works also, giving you a title border
-   */
-  GtkWidget *window = gtk_window_new ((GtkWindowType)window_type);
-  
-  GtkWidget *fixed = gtk_fixed_new ();
-  gtk_widget_set_usize (fixed, 100,100);
-  gtk_container_add (GTK_CONTAINER (window), fixed);
-  gtk_widget_show (fixed);
-  
-  gtk_widget_set_events (window, 
-                        gtk_widget_get_events (window) |
-                        GDK_BUTTON_MOTION_MASK |
-                        GDK_POINTER_MOTION_HINT_MASK |
-                        GDK_BUTTON_PRESS_MASK);
-
-  gtk_widget_realize (window);
-  
-  GdkBitmap *mask = (GdkBitmap*) NULL;
-  if (shape.GetMask()) mask = shape.GetMask()->GetBitmap();
-
-  GtkWidget *pixmap = gtk_pixmap_new (shape.GetPixmap(), mask);
-  gtk_fixed_put (GTK_FIXED (fixed), pixmap, px,py);
-  gtk_widget_show (pixmap);
-  
-  gtk_widget_shape_combine_mask (window, mask, px,py);
-
-
-  gtk_signal_connect (GTK_OBJECT (window), "button_press_event",
-                     GTK_SIGNAL_FUNC (shape_pressed),NULL);
-  gtk_signal_connect (GTK_OBJECT (window), "button_release_event",
-                     GTK_SIGNAL_FUNC (shape_released),NULL);
-  gtk_signal_connect (GTK_OBJECT (window), "motion_notify_event",
-                     GTK_SIGNAL_FUNC (shape_motion),NULL);
-
-  CursorOffset*icon_pos = g_new (CursorOffset, 1);
-  gtk_object_set_user_data(GTK_OBJECT(window), icon_pos);
-
-  gtk_widget_set_uposition (window, x, y);
-  gtk_widget_show (window);
-  
-  return window;
+    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 );
 }
 
 }
 
-#endif 
-       // NEW_GTK_DND_CODE
-       
 #endif
 #endif
-
-      // wxUSE_DRAG_AND_DROP
\ No newline at end of file
+      // wxUSE_DRAG_AND_DROP
wxWidgets (Impactor)