]> 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
fix wxGTK1 compilation after wxTextEntry DoGetValue() change
[wxWidgets.git] / src / gtk / dnd.cpp
diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 4ac5d9bc3cc23b53ec3346766411f53919b2ebf2..dd9fe2745c15e9524be8bfe5f4c1596ac23db3bd 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -1,1101 +1,918 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dnd.cpp
+// Name:        src/gtk/dnd.cpp
 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dnd.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_DRAG_AND_DROP
 
 #include "wx/dnd.h"
 
 
 #include "wx/dnd.h"
 
-#if wxUSE_DRAG_AND_DROP
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/gdicmn.h"
+#endif
+
+#include "wx/scopeguard.h"
+
+#include <gtk/gtk.h>
+
+//----------------------------------------------------------------------------
+// global data
+//----------------------------------------------------------------------------
+
+extern bool g_blockEventsOnDrag;
 
 
-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/gdicmn.h"
-#include "wx/intl.h"
-#include "wx/utils.h"
+// the flags used for the last DoDragDrop()
+static long gs_flagsForDrag = 0;
 
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkprivate.h"
+#ifdef __WXDEBUG__
+// the trace mask we use with wxLogTrace() - call
+// wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here
+// (there are quite a few of them, so don't enable this by default)
+static const wxChar *TRACE_DND = _T("dnd");
+#endif
 
 
-#include <X11/Xlib.h>
+// global variables because GTK+ DnD want to have the
+// mouse event that caused it
+extern GdkEvent *g_lastMouseEvent;
+extern int       g_lastButtonNumber;
+
+//----------------------------------------------------------------------------
+// standard icons
+//----------------------------------------------------------------------------
+
+/* Copyright (c) Julian Smart */
+static const char * page_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 37 1",
+"5 c #7198D9",
+", c #769CDA",
+"2 c #DCE6F6",
+"i c #FFFFFF",
+"e c #779DDB",
+": c #9AB6E4",
+"9 c #EAF0FA",
+"- c #B1C7EB",
+"$ c #6992D7",
+"y c #F7F9FD",
+"= c #BED0EE",
+"q c #F0F5FC",
+"; c #A8C0E8",
+"@ c #366BC2",
+"  c None",
+"u c #FDFEFF",
+"8 c #5987D3",
+"* c #C4D5F0",
+"7 c #7CA0DC",
+"O c #487BCE",
+"< c #6B94D7",
+"& c #CCDAF2",
+"> c #89A9DF",
+"3 c #5584D1",
+"w c #82A5DE",
+"1 c #3F74CB",
+"+ c #3A70CA",
+". c #3569BF",
+"% c #D2DFF4",
+"# c #3366BB",
+"r c #F5F8FD",
+"0 c #FAFCFE",
+"4 c #DFE8F7",
+"X c #5E8AD4",
+"o c #5282D0",
+"t c #B8CCEC",
+"6 c #E5EDF9",
+/* pixels */
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"       .XXXooOO++@#             ",
+"       $%&*=-;::>,<1            ",
+"       $2%&*=-;::><:3           ",
+"       $42%&*=-;::<&:3          ",
+"       56477<<<<8<<9&:X         ",
+"       59642%&*=-;<09&:5        ",
+"       5q9642%&*=-<<<<<#        ",
+"       5qqw777<<<<<88:>+        ",
+"       erqq9642%&*=t;::+        ",
+"       eyrqq9642%&*=t;:O        ",
+"       eyywwww777<<<<t;O        ",
+"       e0yyrqq9642%&*=to        ",
+"       e00yyrqq9642%&*=o        ",
+"       eu0wwwwwww777<&*X        ",
+"       euu00yyrqq9642%&X        ",
+"       eiuu00yyrqq9642%X        ",
+"       eiiwwwwwwwwww742$        ",
+"       eiiiuu00yyrqq964$        ",
+"       eiiiiuu00yyrqq96$        ",
+"       eiiiiiuu00yyrqq95        ",
+"       eiiiiiiuu00yyrqq5        ",
+"       eeeeeeeeeeeeee55e        ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
+};
+
+
+// ============================================================================
+// private functions
+// ============================================================================
 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
-// global
+// convert between GTK+ and wxWidgets DND constants
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-extern bool g_blockEventsOnDrag;
+static wxDragResult ConvertFromGTK(long action)
+{
+    switch ( action )
+    {
+        case GDK_ACTION_COPY:
+            return wxDragCopy;
+
+        case GDK_ACTION_LINK:
+            return wxDragLink;
 
 
-#ifdef NEW_GTK_DND_CODE
+        case GDK_ACTION_MOVE:
+            return wxDragMove;
+    }
 
 
-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+    return wxDragNone;
+}
 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
-                              GdkDragContext *WXUNUSED(context),
-                              guint WXUNUSED(time) )
+                               GdkDragContext *context,
+                               guint WXUNUSED(time),
+                               wxDropTarget *drop_target )
 {
 {
-    printf( "leave.\n" );
+    /* inform the wxDropTarget about the current GdkDragContext.
+       this is only valid for the duration of this call */
+    drop_target->GtkSetDragContext( context );
+
+    /* 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;
+
+    /* after this, invalidate the drop_target's GdkDragContext */
+    drop_target->GtkSetDragContext( NULL );
+}
 }
 
 // ----------------------------------------------------------------------------
 // "drag_motion"
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // "drag_motion"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
 static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
-                                   GdkDragContext *context,
-                                   gint WXUNUSED(x),
-                                   gint WXUNUSED(y),
-                                   guint time )
-{
-    printf( "motion.\n" );
-    gdk_drag_status( context, context->suggested_action, time );
-    return TRUE;
+                                    GdkDragContext *context,
+                                    gint x,
+                                    gint y,
+                                    guint time,
+                                    wxDropTarget *drop_target )
+{
+    /* Owen Taylor: "if the coordinates not in a drop zone,
+       return FALSE, otherwise call gtk_drag_status() and
+       return TRUE" */
+
+#if 0
+    wxPrintf( "motion\n" );
+    GList *tmp_list;
+    for (tmp_list = context->targets; tmp_list; tmp_list = tmp_list->next)
+    {
+        wxString atom = wxString::FromAscii( gdk_atom_name (GDK_POINTER_TO_ATOM (tmp_list->data)) );
+        wxPrintf( "Atom: %s\n", atom );
+    }
+#endif
+
+    /* inform the wxDropTarget about the current GdkDragContext.
+       this is only valid for the duration of this call */
+    drop_target->GtkSetDragContext( context );
+
+    // GTK+ always supposes that we want to copy the data by default while we
+    // might want to move it, so examine not only suggested_action - which is
+    // only good if we don't have our own preferences - but also the actions
+    // field
+    wxDragResult result;
+    if (drop_target->GetDefaultAction() == wxDragNone)
+    {
+        // use default action set by wxDropSource::DoDragDrop()
+        if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
+            (context->actions & GDK_ACTION_MOVE ) )
+        {
+             // move is requested by the program and allowed by GTK+ - do it, even
+            // though suggested_action may be currently wxDragCopy
+            result = wxDragMove;
+        }
+        else // use whatever GTK+ says we should
+        {
+            result = ConvertFromGTK(context->suggested_action);
+
+            if ( (result == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) )
+            {
+                // we're requested to move but we can't
+                result = wxDragCopy;
+            }
+        }
+    }
+    else if (drop_target->GetDefaultAction() == wxDragMove &&
+                (context->actions & GDK_ACTION_MOVE))
+    {
+        
+       result = wxDragMove;
+    }
+    else
+    {
+        if (context->actions & GDK_ACTION_COPY)
+            result = wxDragCopy;
+        else if (context->actions & GDK_ACTION_MOVE)
+            result = wxDragMove;
+        else
+            result = wxDragNone;
+    }
+
+    if (drop_target->m_firstMotion)
+    {
+        /* the first "drag_motion" event substitutes a "drag_enter" event */
+        result = drop_target->OnEnter( x, y, result );
+    }
+    else
+    {
+        /* give program a chance to react (i.e. to say no by returning FALSE) */
+        result = drop_target->OnDragOver( x, y, result );
+    }
+
+    bool ret = wxIsDragResultOk( result );
+    if (ret)
+    {
+        GdkDragAction action;
+        if (result == wxDragCopy)
+            action = GDK_ACTION_COPY;
+        else if (result == wxDragLink)
+            action = GDK_ACTION_LINK;
+        else
+            action = GDK_ACTION_MOVE;
+
+        gdk_drag_status( context, action, time );
+    }
+
+    /* after this, invalidate the drop_target's GdkDragContext */
+    drop_target->GtkSetDragContext( NULL );
+
+    /* this has to be done because GDK has no "drag_enter" event */
+    drop_target->m_firstMotion = false;
+
+    return ret;
+}
 }
 
 // ----------------------------------------------------------------------------
 // "drag_drop"
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // "drag_drop"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static gboolean target_drag_drop( GtkWidget *widget,
 static gboolean target_drag_drop( GtkWidget *widget,
-                                 GdkDragContext *context,
-                                 gint x,
-                                 gint y,
-                                 guint time )
+                                  GdkDragContext *context,
+                                  gint x,
+                                  gint y,
+                                  guint time,
+                                  wxDropTarget *drop_target )
 {
 {
-    printf( "drop at: %d,%d.\n", x, y );
-  
-    if (context->targets)
+    /* 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()" */
+
+    /* 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->GtkSetDragContext( context );
+
+    /* inform the wxDropTarget about the current drag widget.
+       this is only valid for the duration of this call */
+    drop_target->GtkSetDragWidget( widget );
+
+    /* inform the wxDropTarget about the current drag time.
+       this is only valid for the duration of this call */
+    drop_target->GtkSetDragTime( time );
+
+/*
+    wxDragResult result = wxDragMove;
+    if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
+*/
+
+    /* reset the block here as someone might very well
+       show a dialog as a reaction to a drop and this
+       wouldn't work without events */
+    g_blockEventsOnDrag = false;
+
+    bool ret = drop_target->OnDrop( x, y );
+
+    if (!ret)
     {
     {
-        gtk_drag_get_data( widget, 
-                          context, 
-                          GPOINTER_TO_INT (context->targets->data), 
-                          time );
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );
+#endif
+
+        /* cancel the whole thing */
+        gtk_drag_finish( context,
+                          FALSE,        /* no success */
+                          FALSE,        /* don't delete data on dropping side */
+                          time );
+    }
+    else
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") );
+#endif
+
+#if wxUSE_THREADS
+        /* disable GUI threads */
+#endif
+
+        GdkAtom format = drop_target->GtkGetMatchingPair();
+
+        // this does happen somehow, see bug 555111
+        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") );
+
+/*
+        GdkDragAction action = GDK_ACTION_MOVE;
+        if (result == wxDragCopy) action == GDK_ACTION_COPY;
+        context->action = action;
+*/
+        /* this should trigger an "drag_data_received" event */
+        gtk_drag_get_data( widget,
+                           context,
+                           format,
+                           time );
+
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+#endif
     }
     }
-    return FALSE;
+
+    /* after this, invalidate the drop_target's GdkDragContext */
+    drop_target->GtkSetDragContext( NULL );
+
+    /* after this, invalidate the drop_target's drag widget */
+    drop_target->GtkSetDragWidget( NULL );
+
+    /* this has to be done because GDK has no "drag_enter" event */
+    drop_target->m_firstMotion = true;
+
+    return ret;
+}
 }
 
 // ----------------------------------------------------------------------------
 // "drag_data_received"
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // "drag_data_received"
 // ----------------------------------------------------------------------------
 
+extern "C" {
 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 )
-{
-    printf( "data receive at: %d,%d.\n", x, y );
-  
-    if ((data->length >= 0) && (data->format == 8))
+                                       GdkDragContext *context,
+                                       gint x,
+                                       gint y,
+                                       GtkSelectionData *data,
+                                       guint WXUNUSED(info),
+                                       guint time,
+                                       wxDropTarget *drop_target )
+{
+    /* Owen Taylor: "call gtk_drag_finish() with
+       success == TRUE" */
+
+    if ((data->length <= 0) || (data->format != 8))
     {
     {
-        wxString str = (const char*)data->data;
-        printf( "Received %s\n.", WXSTRINGCAST str );
-        gtk_drag_finish( context, TRUE, FALSE, time );
+        /* negative data length and non 8-bit data format
+           qualifies for junk */
+        gtk_drag_finish (context, FALSE, FALSE, time);
+
         return;
     }
         return;
     }
-  
-    gtk_drag_finish (context, FALSE, FALSE, time);
-}
 
 
-// ----------------------------------------------------------------------------
-// wxDropTarget
-// ----------------------------------------------------------------------------
+#ifdef __WXDEBUG__
+    wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") );
+#endif
 
 
-wxDropTarget::wxDropTarget()
-{
-}
+    /* inform the wxDropTarget about the current GtkSelectionData.
+       this is only valid for the duration of this call */
+    drop_target->GtkSetDragData( data );
 
 
-wxDropTarget::~wxDropTarget()
-{
-}
+    wxDragResult result = ConvertFromGTK(context->action);
 
 
-void wxDropTarget::UnregisterWidget( GtkWidget *widget )
-{
-  wxCHECK_RET( widget != NULL, "unregister widget is NULL" );
-  
-  gtk_drag_dest_set( widget,
-                    (GtkDestDefaults) 0,
-                    (GtkTargetEntry*) NULL, 
-                    0,
-                    (GdkDragAction) 0 );
-                    
-  gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                     GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
-
-  gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                     GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
-
-  gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                     GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
-
-  gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-                     GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
-}
-
-void wxDropTarget::RegisterWidget( GtkWidget *widget )
-{
-  wxCHECK_RET( widget != NULL, "register widget is NULL" );
-  
-  GtkTargetEntry format;
-  format.info = 0;
-  format.flags = 0;
-  char buf[100];
-  
-  int valid = 0;
-  for ( size_t i = 0; i < GetFormatCount(); i++ )
-  {
-    wxDataFormat df = GetFormat( i );
-    switch (df) 
+    if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
     {
-      case wxDF_TEXT:
-        format.target = "text/plain";
-       valid++;
-       break;
-      case wxDF_FILENAME:
-        format.target = "file:ALL";
-       valid++;
-       break;
-      case wxDF_PRIVATE:
-        wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this;
-        strcpy( buf, "applications/" );
-       strcat( buf, WXSTRINGCAST pdt->GetID() );
-        format.target = buf;
-       valid++;
-      default:
-        break;
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") );
+#endif
+
+        /* tell GTK that data transfer was successful */
+        gtk_drag_finish( context, TRUE, FALSE, time );
     }
     }
-  }
-  
-  wxASSERT_MSG( valid != 0, "No valid DnD format supported." );
-  
-  gtk_drag_dest_set( widget,
-                    GTK_DEST_DEFAULT_ALL,
-                    &format, 
-                    1,
-                    (GdkDragAction)(GDK_ACTION_COPY | GDK_ACTION_MOVE) ); 
-                    
-  gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",
-                     GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
-
-  gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
-                     GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
-
-  gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
-                     GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
-
-  gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
-                     GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
-}
+    else
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );
+#endif
 
 
-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
+        /* tell GTK that data transfer was not successful */
+        gtk_drag_finish( context, FALSE, FALSE, time );
+    }
 
 
-bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
-{
-  OnDropText( x, y, (const char*)data );
-  return TRUE;
+    /* after this, invalidate the drop_target's drag data */
+    drop_target->GtkSetDragData( NULL );
 }
 }
-
-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;
 }
 
 }
 
-size_t wxTextDropTarget::GetFormatCount() const
+//----------------------------------------------------------------------------
+// wxDropTarget
+//----------------------------------------------------------------------------
+
+wxDropTarget::wxDropTarget( wxDataObject *data )
+            : wxDropTargetBase( data )
 {
 {
-  return 1;
+    m_firstMotion = true;
+    m_dragContext = NULL;
+    m_dragWidget = NULL;
+    m_dragData = NULL;
+    m_dragTime = 0;
 }
 
 }
 
-wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
+wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
+                                       wxCoord WXUNUSED(y),
+                                       wxDragResult def )
 {
 {
-  return wxDF_TEXT;
-}
+    // GetMatchingPair() checks for m_dataObject too, no need to do it here
 
 
-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
+    // disable the debug message from GetMatchingPair() - there are too many
+    // of them otherwise
+#ifdef __WXDEBUG__
+    wxLogNull noLog;
+#endif // Debug
 
 
-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 );
-  for (size_t i = 0; i < nFiles; i++)
-  {
-    printf( aszFiles[i] );
-    printf( "\n" );
-  }
-  return TRUE;
+    return (GtkGetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;
 }
 
 }
 
-bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
+bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
 {
 {
-  size_t number = 0;
-  char *text = (char*) data;
-  for (size_t i = 0; i < size; i++)
-    if (text[i] == 0) number++;
-
-  if (number == 0) return TRUE;    
-    
-  char **files = new char*[number];
-  
-  text = (char*) data;
-  for (size_t i = 0; i < number; i++)
-  {
-    files[i] = text;
-    int len = strlen( text );
-    text += len+1;
-  }
-
-  bool ret = OnDropFiles( x, y, 1, files ); 
-  
-  free( files );
-  
-  return ret;
-}
+    if (!m_dataObject)
+        return false;
 
 
-size_t wxFileDropTarget::GetFormatCount() const
-{
-  return 1;
+    return (GtkGetMatchingPair() != (GdkAtom) 0);
 }
 
 }
 
-wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
+wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                   wxDragResult def )
 {
 {
-  return wxDF_FILENAME;
-}
+    if (!m_dataObject)
+        return wxDragNone;
 
 
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
+    if (GtkGetMatchingPair() == (GdkAtom) 0)
+        return wxDragNone;
 
 
-wxDropSource::wxDropSource( wxWindow *win )
-{
-  g_blockEventsOnDrag = TRUE;
-  
-  m_window = win;
-  m_widget = win->m_widget;
-  if (win->m_wxwindow) m_widget = win->m_wxwindow;
-  
-  m_data = (wxDataObject *) NULL;
-  m_retValue = wxDragCancel;
-
-  m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-  m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    return GetData() ? def : wxDragNone;
 }
 
 }
 
-wxDropSource::wxDropSource( wxDataObject &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;
-
-  m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-  m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-}
 
 
-void wxDropSource::SetData( wxDataObject &data )
+wxDataFormat wxDropTarget::GetMatchingPair()
 {
 {
-  m_data = &data;  
+    return wxDataFormat( GtkGetMatchingPair() );
 }
 
 }
 
-wxDropSource::~wxDropSource(void)
+GdkAtom wxDropTarget::GtkGetMatchingPair()
 {
 {
-//  if (m_data) delete m_data;
+    if (!m_dataObject)
+        return (GdkAtom) 0;
 
 
-  g_blockEventsOnDrag = FALSE;
-}
-   
-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
-{
-  wxASSERT_MSG( m_data, "wxDragSource: no data" );
-  
-  if (!m_data) return (wxDragResult) wxDragNone;
-  if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
-  
-  RegisterWindow();
-  
-  // TODO
-  
-  UnregisterWindow();
-  
-  g_blockEventsOnDrag = FALSE;
-  
-  return m_retValue;
-}
+    if (!m_dragContext)
+        return (GdkAtom) 0;
 
 
-void wxDropSource::RegisterWindow(void)
-{
-  if (!m_data) return;
-
-  wxString formats;
-    
-  wxDataFormat df = m_data->GetPreferredFormat();
-  
-    switch (df) 
+    GList *child = m_dragContext->targets;
+    while (child)
     {
     {
-      case wxDF_TEXT: 
-        formats += "text/plain";
-       break;
-      case wxDF_FILENAME:
-        formats += "file:ALL";
-       break;
-      default:
-        break;
-    }
-  
-  char *str = WXSTRINGCAST formats;
-  
-  // TODO
-}
+        GdkAtom formatAtom = (GdkAtom)(child->data);
+        wxDataFormat format( formatAtom );
 
 
-void wxDropSource::UnregisterWindow(void)
-{
-  if (!m_widget) return;
-  
-  // TODO
-}
+#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;
 
 
-#else  // NEW_CODE
-
-GtkWidget *shape_create_icon (char     **data,
-                             gint      x,
-                             gint      y,
-                             gint      px,
-                             gint      py,
-                             gint      window_type);
-
-/* XPM */
-static char * gv_xpm[] = {
-"40 34 3 1",
-"      s None c None",
-".     c black",
-"X     c white",
-"                                        ",
-"                                        ",
-"                  ......                ",
-"                ..XXXXXX..              ",
-"               .XXXXXXXXXX.             ",
-"              .XXXXXXXXXXXX.            ",
-"              .XXXXXXXXXXXX.            ",
-"             .XXXXXXXXXXXXXX.           ",
-"             .XXX..XXXX..XXX.           ",
-"          ....XX....XX....XX.           ",
-"         .XXX.XXX..XXXX..XXX....        ",
-"        .XXXXXXXXXXXXXXXXXXX.XXX.       ",
-"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
-"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
-"         ..XXXXXXXXXXXXXXXXXXXXXX.      ",
-"           .XXXXXXXXXXXXXXXXXX...       ",
-"           ..XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXXX.         ",
-"            .XXXXXXXXXXXXXXXXX.         ",
-"            .XXXXXXXXXXXXXXXXXX.        ",
-"            .XXXXXXXXXXXXXXXXXXX.       ",
-"           .XXXXXXXXXXXXXXXXXXXXX.      ",
-"           .XXXXXXXXXXXXXX.XXXXXXX.     ",
-"          .XXXXXXX.XXXXXXX.XXXXXXX.     ",
-"         .XXXXXXXX.XXXXXXX.XXXXXXX.     ",
-"         .XXXXXXX...XXXXX...XXXXX.      ",
-"         .XXXXXXX.  .....   .....       ",
-"         ..XXXX..                       ",
-"           ....                         ",
-"                                        ",
-"                                        ",
-"                                        "};
-                             
-/* XPM */
-static char * page_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"32 32 5 1",
-/* colors */
-"      s None  c None",
-".     c black",
-"X     c wheat",
-"o     c tan",
-"O     c #6699FF",
-/* pixels */
-"    ...................         ",
-"    .XXXXXXXXXXXXXXXXX..        ",
-"    .XXXXXXXXXXXXXXXXX.o.       ",
-"    .XXXXXXXXXXXXXXXXX.oo.      ",
-"    .XXXXXXXXXXXXXXXXX.ooo.     ",
-"    .XXXXXXXXXXXXXXXXX.oooo.    ",
-"    .XXXXXXXXXXXXXXXXX.......   ",
-"    .XXXXXOOOOOOOOOOXXXooooo.   ",
-"    .XXXXXXXXXXXXXXXXXXooooo.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .........................   "};
-                             
-                             
-//-----------------------------------------------------------------------------
-// globals
-//-----------------------------------------------------------------------------
-
-wxDropSource *gs_currentDropSource = (wxDropSource*) NULL;
-
-//-----------------------------------------------------------------------------
-// "drop_enter_event"
-//-----------------------------------------------------------------------------
+        child = child->next;
+    }
 
 
-static void gtk_target_enter_callback( GtkWidget *WXUNUSED(widget), 
-                                       GdkEventDropEnter *WXUNUSED(event), 
-                                      wxDropTarget *target )
-{
-    if (target)
-        target->OnEnter();
+    return (GdkAtom) 0;
 }
 
 }
 
-//-----------------------------------------------------------------------------
-// "drop_leave_event"
-//-----------------------------------------------------------------------------
-
-static void gtk_target_leave_callback( GtkWidget *WXUNUSED(widget), 
-                                       GdkEventDropLeave *WXUNUSED(event), 
-                                      wxDropTarget *target )
+bool wxDropTarget::GetData()
 {
 {
-    if (target)
-        target->OnLeave();
-}
+    if (!m_dragData)
+        return false;
 
 
-//-----------------------------------------------------------------------------
-// "drop_data_available_event"
-//-----------------------------------------------------------------------------
+    if (!m_dataObject)
+        return false;
 
 
-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 );
-    }
+    wxDataFormat dragFormat( m_dragData->target );
 
 
-/*
-    g_free (event->data);
-    g_free (event->data_type);
-*/
-}
+    if (!m_dataObject->IsSupportedFormat( dragFormat ))
+        return false;
 
 
-// ----------------------------------------------------------------------------
-// wxDropTarget
-// ----------------------------------------------------------------------------
+    m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );
 
 
-wxDropTarget::wxDropTarget()
-{
+    return true;
 }
 
 }
 
-wxDropTarget::~wxDropTarget()
+void wxDropTarget::GtkUnregisterWidget( GtkWidget *widget )
 {
 {
-}
+    wxCHECK_RET( widget != NULL, wxT("unregister widget is NULL") );
 
 
-void wxDropTarget::UnregisterWidget( GtkWidget *widget )
-{
-    if (!widget) return;
-  
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-      GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this );
+    gtk_drag_dest_unset( widget );
 
 
-    gtk_widget_dnd_drop_set( widget, FALSE, (gchar **) NULL, 0, FALSE );
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_leave, this);
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_motion, this);
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_drop, this);
+    g_signal_handlers_disconnect_by_func (widget,
+                                          (gpointer) target_drag_data_received, this);
 }
 
 }
 
-void wxDropTarget::RegisterWidget( GtkWidget *widget )
+void wxDropTarget::GtkRegisterWidget( GtkWidget *widget )
 {
 {
-    wxString formats;
-    int valid = 0;
-  
-    for ( size_t i = 0; i < GetFormatCount(); i++ )
-    {
-        wxDataFormat df = GetFormat( i );
-        switch (df) 
-        {
-            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 += "applications/";
-                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 );
-}
+    wxCHECK_RET( widget != NULL, wxT("register widget is NULL") );
 
 
-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
+    /* 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
+       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. */
 
 
-bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
-{
-    OnDropText( x, y, (const char*)data );
-    return TRUE;
-}
+    gtk_drag_dest_set( widget,
+                       (GtkDestDefaults) 0,         /* no default behaviour */
+                       NULL,      /* we don't supply any formats here */
+                       0,                           /* number of targets = 0 */
+                       (GdkDragAction) 0 );         /* we don't supply any actions here */
 
 
-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;
-}
+    g_signal_connect (widget, "drag_leave",
+                      G_CALLBACK (target_drag_leave), this);
 
 
-size_t wxTextDropTarget::GetFormatCount() const
-{
-    return 1;
-}
+    g_signal_connect (widget, "drag_motion",
+                      G_CALLBACK (target_drag_motion), this);
 
 
-wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
-{
-    return wxDF_TEXT;
+    g_signal_connect (widget, "drag_drop",
+                      G_CALLBACK (target_drag_drop), this);
+
+    g_signal_connect (widget, "drag_data_received",
+                      G_CALLBACK (target_drag_data_received), this);
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxPrivateDropTarget
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------
 
 
-wxPrivateDropTarget::wxPrivateDropTarget()
-{
-    m_id = wxTheApp->GetAppName();
-}
+extern "C" {
+static void
+source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
+                       GdkDragContext     *WXUNUSED(context),
+                       GtkSelectionData   *selection_data,
+                       guint               WXUNUSED(info),
+                       guint               WXUNUSED(time),
+                       wxDropSource       *drop_source )
+{
+    wxDataFormat format( selection_data->target );
+
+#ifdef __WXDEBUG__
+    wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
+               format.GetId().c_str());
+#endif
 
 
-size_t wxPrivateDropTarget::GetFormatCount() const
-{
-    return 1;
-}
+    drop_source->m_retValue = wxDragCancel;
 
 
-wxDataFormat wxPrivateDropTarget::GetFormat(size_t WXUNUSED(n)) const
-{
-    return wxDF_PRIVATE;
-}
+    wxDataObject *data = drop_source->GetDataObject();
 
 
-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
+    if (!data)
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );
+#endif
+       return;
+    }
 
 
-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 );
+    if (!data->IsSupportedFormat(format))
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );
+#endif
+       return;
+    }
 
 
-    for (size_t i = 0; i < nFiles; i++)
+    if (data->GetDataSize(format) == 0)
     {
     {
-        printf( aszFiles[i] );
-        printf( "\n" );
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );
+#endif
+       return;
     }
     }
-    
-    return TRUE;
-}
 
 
-bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
-{
-    size_t number = 0;
-    char *text = (char*) data;
-    for (size_t i = 0; i < size; i++)
-        if (text[i] == 0) number++;
-
-    if (number == 0) return TRUE;    
-    
-    char **files = new char*[number];
-  
-    text = (char*) data;
-    for (size_t i = 0; i < number; i++)
+    size_t size = data->GetDataSize(format);
+
+//  printf( "data size: %d.\n", (int)data_size );
+
+    guchar *d = new guchar[size];
+
+    if (!data->GetDataHere( format, (void*)d ))
     {
     {
-        files[i] = text;
-        int len = strlen( text );
-        text += len+1;
+        delete[] d;
+        return;
     }
 
     }
 
-    bool ret = OnDropFiles( x, y, 1, files ); 
-  
-    free( files );
-  
-    return ret;
-}
+#if wxUSE_THREADS
+    /* disable GUI threads */
+#endif
 
 
-size_t wxFileDropTarget::GetFormatCount() const
-{
-    return 1;
+    gtk_selection_data_set( selection_data,
+                            selection_data->target,
+                            8,   // 8-bit
+                            d,
+                            size );
+
+#if wxUSE_THREADS
+    /* enable GUI threads */
+#endif
+
+    delete[] d;
 }
 }
+}
+
+//----------------------------------------------------------------------------
+// "drag_end"
+//----------------------------------------------------------------------------
 
 
-wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
+extern "C" {
+static void source_drag_end( GtkWidget          *WXUNUSED(widget),
+                             GdkDragContext     *WXUNUSED(context),
+                             wxDropSource       *drop_source )
 {
 {
-    return wxDF_FILENAME;
-}
+    // printf( "Drag source: drag_end.\n" );
 
 
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
+    drop_source->m_waiting = false;
+}
+}
 
 
-static void
-shape_motion (GtkWidget      *widget, 
-             GdkEventMotion * /*event*/);
-             
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-// drag request
+// "configure_event" from m_iconWindow
+//-----------------------------------------------------------------------------
 
 
-void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source )
+extern "C" {
+static gint
+gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {
 {
-    wxDataObject *data = source->m_data;
+    source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
 
 
-    switch (data->GetFormat())
-    {
-        case wxDF_PRIVATE:
-       {
-            wxPrivateDataObject *pdo = (wxPrivateDataObject*) data;
-           
-            gtk_widget_dnd_data_set( widget, 
-                                    event,
-                                    (unsigned char*) pdo->GetData(), 
-                                    (int) pdo->GetDataSize() );
-           
-           break;
-       }
-        case wxDF_TEXT:
-       {
-           wxTextDataObject *text_object = (wxTextDataObject*) data;
-           
-           wxString text = text_object->GetText();
-           
-           char *s = WXSTRINGCAST text;
-           
-            gtk_widget_dnd_data_set( widget, 
-                                    event, 
-                                    (unsigned char*) s, 
-                                    (int) text.Length()+1 );
-       
-           break;
-       }
-       
-        case wxDF_FILENAME:
-       {
-           wxFileDataObject *file_object = (wxFileDataObject*) data;
-           
-           wxString text = file_object->GetFiles();
-           
-           char *s = WXSTRINGCAST text;
-           
-            gtk_widget_dnd_data_set( widget, 
-                                    event, 
-                                    (unsigned char*) s, 
-                                    (int) text.Length()+1 );
-       
-           break;
-       }
-       
-       default:
-       {
-           return;
-       }
-   }
-  
-  source->m_retValue = wxDragCopy;
+    return 0;
 }
 }
+}
+
+//---------------------------------------------------------------------------
+// wxDropSource
+//---------------------------------------------------------------------------
 
 
-wxDropSource::wxDropSource( wxWindow *win )
+wxDropSource::wxDropSource(wxWindow *win,
+                           const wxIcon &iconCopy,
+                           const wxIcon &iconMove,
+                           const wxIcon &iconNone)
 {
 {
-    g_blockEventsOnDrag = TRUE;
-  
+    m_waiting = true;
+
+    m_iconWindow = 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 = (wxDataObject *) NULL;
+
     m_retValue = wxDragCancel;
 
     m_retValue = wxDragCancel;
 
-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    SetIcons(iconCopy, iconMove, iconNone);
 }
 
 }
 
-wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
+wxDropSource::wxDropSource(wxDataObject& data,
+                           wxWindow *win,
+                           const wxIcon &iconCopy,
+                           const wxIcon &iconMove,
+                           const wxIcon &iconNone)
 {
 {
-    g_blockEventsOnDrag = TRUE;
-  
+    m_waiting = true;
+
+    SetData( data );
+
+    m_iconWindow = NULL;
+
     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;
     m_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;
+
     m_retValue = wxDragCancel;
     m_retValue = wxDragCancel;
-  
-    m_data = &data;
 
 
-    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    SetIcons(iconCopy, iconMove, iconNone);
 }
 
 }
 
-void wxDropSource::SetData( wxDataObject &data )
+void wxDropSource::SetIcons(const wxIcon &iconCopy,
+                            const wxIcon &iconMove,
+                            const wxIcon &iconNone)
 {
 {
-    m_data = &data;  
+    m_iconCopy = iconCopy;
+    m_iconMove = iconMove;
+    m_iconNone = iconNone;
+
+    if ( !m_iconCopy.Ok() )
+        m_iconCopy = wxIcon(page_xpm);
+    if ( !m_iconMove.Ok() )
+        m_iconMove = m_iconCopy;
+    if ( !m_iconNone.Ok() )
+        m_iconNone = m_iconCopy;
 }
 
 }
 
-wxDropSource::~wxDropSource(void)
+wxDropSource::~wxDropSource()
 {
 {
-//    if (m_data) delete m_data;
-
-    g_blockEventsOnDrag = FALSE;
 }
 }
-   
-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+
+void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
 {
 {
-    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 ( gv_xpm,
-                                        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 ( page_xpm,
-                                        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)
-    {
-        g_free( gdk_dnd.drag_startwindows );
-        gdk_dnd.drag_startwindows = (GdkWindow **) NULL;
-    }
-    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;
-  
-    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;
+    // 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 = NULL;
+
+    GdkPixmap *pixmap = icon->GetPixmap();
+
+    gint width,height;
+    gdk_drawable_get_size (pixmap, &width, &height);
+
+    GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
+    gtk_widget_push_colormap (colormap);
+
+    m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
+    gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+    gtk_widget_set_app_paintable (m_iconWindow, TRUE);
+
+    gtk_widget_pop_colormap ();
+
+    gtk_widget_set_size_request (m_iconWindow, width, height);
+    gtk_widget_realize (m_iconWindow);
+
+    g_signal_connect (m_iconWindow, "configure_event",
+                      G_CALLBACK (gtk_dnd_window_configure_callback), this);
+
+    gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE);
+
+    if (mask)
+        gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0);
+
+    gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 );
 }
 
 }
 
-void wxDropSource::RegisterWindow(void)
+wxDragResult wxDropSource::DoDragDrop(int flags)
 {
 {
-    if (!m_data) return;
+    wxCHECK_MSG( m_data && m_data->GetFormatCount(), wxDragNone,
+                 wxT("Drop source: no data") );
+
+    // still in drag
+    if (g_blockEventsOnDrag)
+        return wxDragNone;
+
+    // don't start dragging if no button is down
+    if (g_lastButtonNumber == 0)
+        return wxDragNone;
+
+    // we can only start a drag after a mouse event
+    if (g_lastMouseEvent == NULL)
+        return wxDragNone;
+
+    GTKConnectDragSignals();
+    wxON_BLOCK_EXIT_OBJ0(*this, wxDropSource::GTKDisconnectDragSignals);
 
 
-    wxString formats;
-    
-    wxDataFormat df = m_data->GetFormat();
-  
-    switch (df) 
+    m_waiting = true;
+
+    GtkTargetList *target_list = gtk_target_list_new( NULL, 0 );
+
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+    size_t count = m_data->GetFormatCount();
+    for (size_t i = 0; i < count; i++)
     {
     {
-        case wxDF_TEXT:
-       { 
-            formats += "text/plain";
-           break;
-       }
-        case wxDF_FILENAME:
-       {
-            formats += "file:ALL";
-           break;
-       }
-        case wxDF_PRIVATE:
-       {
-           wxPrivateDataObject* pdo = (wxPrivateDataObject*) m_data;
-           formats += "applications/";
-           formats += pdo->GetId();
-           break;
-       }
-        default:
-            break;
+        GdkAtom atom = array[i];
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));
+#endif
+       gtk_target_list_add( target_list, atom, 0, 0 );
     }
     }
-  
-    char *str = WXSTRINGCAST formats;
-  
-    gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 );
+    delete[] array;
 
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event",
-      GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this );
-}
+    int action = GDK_ACTION_COPY;
+    if ( flags & wxDrag_AllowMove )
+        action |= GDK_ACTION_MOVE;
 
 
-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 );
-}
+    // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad
+    //     to use a global to pass the flags to the drop target but I'd
+    //     surely prefer a better way to do it
+    gs_flagsForDrag = flags;
 
 
+    GdkDragContext *context = gtk_drag_begin( m_widget,
+                target_list,
+                (GdkDragAction)action,
+                g_lastButtonNumber,  // number of mouse button which started drag
+                (GdkEvent*) g_lastMouseEvent );
 
 
-/*
- * Shaped Windows
- */
-static GdkWindow *root_win = (GdkWindow*) NULL;
+    if ( !context )
+    {
+        // this can happen e.g. if gdk_pointer_grab() failed
+        return wxDragError;
+    }
 
 
-typedef struct _cursoroffset {gint x,y;} CursorOffset;
+    m_dragContext = context;
 
 
-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);
-}
+    PrepareIcon( action, context );
 
 
+    while (m_waiting)
+        gtk_main_iteration();
 
 
-static void
-shape_released (GtkWidget *widget)
-{
-  gtk_grab_remove (widget);
-  gdk_pointer_ungrab (0);
+    m_retValue = ConvertFromGTK(context->action);
+    if ( m_retValue == wxDragNone )
+         m_retValue = wxDragCancel;
+
+    return m_retValue;
 }
 
 }
 
-static void
-shape_motion (GtkWidget      *widget, 
-             GdkEventMotion * /*event*/ )
+void wxDropSource::GTKConnectDragSignals()
 {
 {
-  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;
+
+    g_blockEventsOnDrag = true;
+
+    g_signal_connect (m_widget, "drag_data_get",
+                      G_CALLBACK (source_drag_data_get), this);
+    g_signal_connect (m_widget, "drag_end",
+                      G_CALLBACK (source_drag_end), this);
+
 }
 
 }
 
-GtkWidget *
-shape_create_icon (char     **data,
-                  gint      x,
-                  gint      y,
-                  gint      px,
-                  gint      py,
-                  gint      window_type)
+void wxDropSource::GTKDisconnectDragSignals()
 {
 {
-  GtkWidget *window;
-  GtkWidget *pixmap;
-  GtkWidget *fixed;
-  CursorOffset* icon_pos;
-  GdkGC* gc;
-  GdkBitmap *gdk_pixmap_mask;
-  GdkPixmap *gdk_pixmap;
-  GtkStyle *style;
-
-  style = gtk_widget_get_default_style ();
-  gc = style->black_gc;        
-
-  /*
-   * GDK_WINDOW_TOPLEVEL works also, giving you a title border
-   */
-  window = gtk_window_new ((GtkWindowType)window_type);
-  
-  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);
-  
-  gdk_pixmap = gdk_pixmap_create_from_xpm_d (window->window, &gdk_pixmap_mask, 
-                                          &style->bg[GTK_STATE_NORMAL],
-                                          (gchar**) data );
-
-  pixmap = gtk_pixmap_new (gdk_pixmap, gdk_pixmap_mask);
-  gtk_fixed_put (GTK_FIXED (fixed), pixmap, px,py);
-  gtk_widget_show (pixmap);
-  
-  gtk_widget_shape_combine_mask (window, gdk_pixmap_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);
-
-  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;
+
+    g_blockEventsOnDrag = false;
+
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) source_drag_data_get,
+                                          this);
+    g_signal_handlers_disconnect_by_func (m_widget,
+                                          (gpointer) source_drag_end,
+                                          this);
 }
 
 }
 
-#endif 
-       // NEW_GTK_DND_CODE
-       
 #endif
 #endif
-
-      // wxUSE_DRAG_AND_DROP
\ No newline at end of file
+      // wxUSE_DRAG_AND_DROP
wxWidgets (Impactor)