switching to CreateXXX methods for Controls and to Hit Event Processing, thus support...

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

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index e36ee810cbef2333a09ef0634815ae6f7e7c79e8..2181646be5aa88eb64dd8c612b33e93d6ec91f2b 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -4,44 +4,161 @@
 // 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__
-#pragma implementation "dnd.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "dnd.h"

 #endif
 
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/dnd.h"
 #include "wx/dnd.h"

+#include "wx/log.h"
+                                                                              
+                                                                               
+#if wxUSE_DRAG_AND_DROP
+

 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/intl.h"
 #include "wx/utils.h"
 
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/intl.h"
 #include "wx/utils.h"
 

-#include "gdk/gdkprivate.h"
+#include "wx/gtk/private.h"
+
+#include <gdk/gdkprivate.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
+#endif
+
+//----------------------------------------------------------------------------
+// global data
+//----------------------------------------------------------------------------
+
+extern bool g_blockEventsOnDrag;
+
+// the flags used for the last DoDragDrop()
+static long gs_flagsForDrag = 0;

 
 

-#include <X11/Xlib.h>
+// the trace mask we use with wxLogTrace() - call
+// wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here
+// (there are quite a few of them, so don't enable this by default)
+static const wxChar *TRACE_DND = _T("dnd");
+
+//----------------------------------------------------------------------------
+// standard icons
+//----------------------------------------------------------------------------
+
+/* XPM */
+static const 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.   ",
+"    .........................   "};
+
+
+// ============================================================================
+// private functions
+// ============================================================================

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// global
+// convert between GTK+ and wxWindows DND constants

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-extern bool g_blockEventsOnDrag;
+static wxDragResult ConvertFromGTK(long action)
+{
+    switch ( action )
+    {
+        case GDK_ACTION_COPY:
+            return wxDragCopy;

 
 

-#ifdef NEW_GTK_DND_CODE
+        case GDK_ACTION_LINK:
+            return wxDragLink;

 
 

-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+        case GDK_ACTION_MOVE:
+            return wxDragMove;
+    }
+
+    return wxDragNone;
+}

 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
 
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
 
 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" );
+    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 );
+
+    /* 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->SetDragContext( (GdkDragContext*) NULL );

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


@@ -49,14 +166,77 @@ 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 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 )
+{
+    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" */
+
+    /* inform the wxDropTarget about the current GdkDragContext.
+       this is only valid for the duration of this call */
+    drop_target->SetDragContext( context );
+
+    // GTK+ always supposes that we want to copy the data by default while we
+    // might want to move it, so examine not only suggested_action - which is
+    // only good if we don't have our own preferences - but also the actions
+    // field
+    wxDragResult result;
+    if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
+            (context->actions & GDK_ACTION_MOVE ) )
+    {
+        // move is requested by the program and allowed by GTK+ - do it, even
+        // though suggested_action may be currently wxDragCopy
+        result = wxDragMove;
+    }
+    else // use whatever GTK+ says we should
+    {
+        result = ConvertFromGTK(context->suggested_action);
+
+        if ( (result == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) )
+        {
+            // we're requested to move but we can't
+            result = wxDragCopy;
+        }
+    }
+
+    if (drop_target->m_firstMotion)
+    {
+        /* the first "drag_motion" event substitutes a "drag_enter" event */
+        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->SetDragContext( (GdkDragContext*) NULL );
+
+    /* this has to be done because GDK has no "drag_enter" event */
+    drop_target->m_firstMotion = FALSE;
+
+    return ret;

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


@@ -64,21 +244,98 @@ 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 )
+                                  GdkDragContext *context,
+                                  gint x,
+                                  gint y,
+                                  guint time,
+                                  wxDropTarget *drop_target )

 {
 {

-    printf( "drop at: %d,%d.\n", x, y );
-  
-    if (context->targets)
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    /* Owen Taylor: "if the drop is not in a drop zone,
+       return FALSE, otherwise, if you aren't accepting
+       the drop, call gtk_drag_finish() with success == FALSE
+       otherwise call gtk_drag_data_get()" */
+
+//    printf( "drop.\n" );
+
+    /* 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 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 );
+
+/*
+    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 );
+        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
+    {
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned TRUE") );
+
+#if wxUSE_THREADS
+        /* disable GUI threads */
+#endif
+
+        GdkAtom format = drop_target->GetMatchingPair();
+
+        // this does happen somehow, see bug 555111
+        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") )
+
+/*
+        GdkDragAction action = GDK_ACTION_MOVE;
+        if (result == wxDragCopy) action == GDK_ACTION_COPY;
+        context->action = action;
+*/
+        /* this should trigger an "drag_data_received" event */
+        gtk_drag_get_data( widget,
+                           context,
+                           format,
+                           time );
+
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+#endif

     }
     }

-    return FALSE;
+
+    /* 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 );
+
+    /* this has to be done because GDK has no "drag_enter" event */
+    drop_target->m_firstMotion = TRUE;
+
+    return ret;

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


@@ -86,876 +343,563 @@ 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 )
+                                       GdkDragContext *context,
+                                       gint x,
+                                       gint y,
+                                       GtkSelectionData *data,
+                                       guint WXUNUSED(info),
+                                       guint time,
+                                       wxDropTarget *drop_target )

 {
 {

-    printf( "data receive at: %d,%d.\n", x, y );
-  
-    if ((data->length >= 0) && (data->format == 8))
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    /* 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 );
-      return;
+        /* negative data length and non 8-bit data format
+           qualifies for junk */
+        gtk_drag_finish (context, FALSE, FALSE, time);
+
+        return;

     }
     }

-  
-    gtk_drag_finish (context, FALSE, FALSE, time);
-}

 
 

-// ----------------------------------------------------------------------------
-// wxDropTarget
-// ----------------------------------------------------------------------------
+    wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") );

 
 

-wxDropTarget::wxDropTarget()
-{
-}
+    /* inform the wxDropTarget about the current GtkSelectionData.
+       this is only valid for the duration of this call */
+    drop_target->SetDragData( data );

 
 

-wxDropTarget::~wxDropTarget()
-{
-}
+    wxDragResult result = ConvertFromGTK(context->suggested_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 );
-}
+    if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
+    {
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") );

 
 

-void wxDropTarget::RegisterWidget( GtkWidget *widget )
-{
-  wxCHECK_RET( widget != NULL, "register widget is NULL" );
-  
-  GtkTargetEntry format;
-  format.info = 0;
-  format.flags = 0;
-  
-  int valid = 0;
-  for ( size_t i = 0; i < GetFormatCount(); i++ )
-  {
-    wxDataFormat df = GetFormat( i );
-    switch (df) 
+        /* tell GTK that data transfer was successfull */
+        gtk_drag_finish( context, TRUE, FALSE, time );
+    }
+    else

     {
     {

-      case wxDF_TEXT:
-        format.target = "text/plain";
-       valid++;
-       break;
-      case wxDF_FILENAME:
-        format.target = "file:ALL";
-       valid++;
-       break;
-      default:
-        break;
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );
+
+        /* tell GTK that data transfer was not successfull */
+        gtk_drag_finish( context, FALSE, 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 );
+
+    /* after this, invalidate the drop_target's drag data */
+    drop_target->SetDragData( (GtkSelectionData*) NULL );

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+// wxDropTarget
+//----------------------------------------------------------------------------

 
 

-bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
+wxDropTarget::wxDropTarget( wxDataObject *data )
+            : wxDropTargetBase( data )

 {
 {

-  OnDropText( x, y, (const char*)data );
-  return TRUE;
+    m_firstMotion = TRUE;
+    m_dragContext = (GdkDragContext*) NULL;
+    m_dragWidget = (GtkWidget*) NULL;
+    m_dragData = (GtkSelectionData*) NULL;
+    m_dragTime = 0;

 }
 
 }
 

-bool wxTextDropTarget::OnDropText( long x, long y, const char *psz )
+wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
+                                       wxCoord WXUNUSED(y),
+                                       wxDragResult def )

 {
 {

-  printf( "Got dropped text: %s.\n", psz );
-  printf( "At x: %d, y: %d.\n", (int)x, (int)y );
-  return TRUE;
+    // GetMatchingPair() checks for m_dataObject too, no need to do it here
+
+    // 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;

 }
 
 }
 

-size_t wxTextDropTarget::GetFormatCount() const
+bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )

 {
 {

-  return 1;
+    if (!m_dataObject)
+        return FALSE;
+
+    return (GetMatchingPair() != (GdkAtom) 0);

 }
 
 }
 

-wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
+wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                   wxDragResult def )

 {
 {

-  return wxDF_TEXT;
-}
+    if (!m_dataObject)
+        return wxDragNone;

 
 

-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
+    if (GetMatchingPair() == (GdkAtom) 0)
+        return wxDragNone;

 
 

-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 GetData() ? def : wxDragNone;

 }
 
 }
 

-bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
+GdkAtom wxDropTarget::GetMatchingPair()

 {
 {

-  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 (GdkAtom) 0;

 
 

-size_t wxFileDropTarget::GetFormatCount() const
-{
-  return 1;
-}
+    if (!m_dragContext)
+        return (GdkAtom) 0;

 
 

-wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
-{
-  return wxDF_FILENAME;
-}
+    GList *child = m_dragContext->targets;
+    while (child)
+    {
+        GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
+        wxDataFormat format( formatAtom );

 
 

-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"),
+                   format.GetId().c_str());
+#endif // Debug

 
 

-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 );
-}
+        if (m_dataObject->IsSupportedFormat( format ))
+            return formatAtom;

 
 

-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 );
+        child = child->next;
+    }
+
+    return (GdkAtom) 0;

 }
 
 }
 

-void wxDropSource::SetData( wxDataObject &data )
+bool wxDropTarget::GetData()

 {
 {

-  m_data = &data;  
+    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;

 }
 
 }
 

-wxDropSource::~wxDropSource(void)
+void wxDropTarget::UnregisterWidget( GtkWidget *widget )

 {
 {

-//  if (m_data) delete m_data;
+    wxCHECK_RET( widget != NULL, wxT("unregister widget is NULL") );
+
+    gtk_drag_dest_unset( widget );
+
+    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
+                      GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );

 
 

-  g_blockEventsOnDrag = FALSE;
+    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 );

 }
 }

-   
-wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+
+void wxDropTarget::RegisterWidget( GtkWidget *widget )

 {
 {

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

 }
 
 }
 

-void wxDropSource::RegisterWindow(void)
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------
+
+static void
+source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
+                       GdkDragContext     *WXUNUSED(context),
+                       GtkSelectionData   *selection_data,
+                       guint               WXUNUSED(info),
+                       guint               WXUNUSED(time),
+                       wxDropSource       *drop_source )

 {
 {

-  if (!m_data) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    wxDataFormat format( selection_data->target );
+
+    wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
+               format.GetId().c_str());

 
 

-  wxString formats;
-    
-  wxDataFormat df = m_data->GetPreferredFormat();
-  
-    switch (df) 
+    drop_source->m_retValue = wxDragCancel;
+
+    wxDataObject *data = drop_source->GetDataObject();
+
+    if (!data)

     {
     {

-      case wxDF_TEXT: 
-        formats += "text/plain";
-       break;
-      case wxDF_FILENAME:
-        formats += "file:ALL";
-       break;
-      default:
-        break;
+        wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );
+        return;

     }
     }

-  
-  char *str = WXSTRINGCAST formats;
-  
-  // TODO
-}

 
 

-void wxDropSource::UnregisterWindow(void)
-{
-  if (!m_widget) return;
-  
-  // TODO
-}
+    if (!data->IsSupportedFormat(format))
+    {
+        wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );
+        return;
+    }

 
 

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

 
 

-#else  // NEW_CODE
+    size_t size = data->GetDataSize(format);

 
 

-GtkWidget *shape_create_icon (char     **data,
-                             gint      x,
-                             gint      y,
-                             gint      px,
-                             gint      py,
-                             gint      window_type);
+//  printf( "data size: %d.\n", (int)data_size );

 
 

-/* 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.   ",
-"    .........................   "};
-                             
-                             
-//-----------------------------------------------------------------------------
-// "drop_data_available_event"
-//-----------------------------------------------------------------------------
+    guchar *d = new guchar[size];

 
 

-static void gtk_target_callback( GtkWidget *widget, 
-                                 GdkEventDropDataAvailable *event, 
-                                wxDropTarget *target )
-{
-    if (target)
+    if (!data->GetDataHere( format, (void*)d ))

     {
     {

-        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 );
+        delete[] d;
+        return;

     }
 
     }
 

-/*
-    g_free (event->data);
-    g_free (event->data_type);
-*/
-}
+#if wxUSE_THREADS
+    /* disable GUI threads */
+#endif

 
 

-// ----------------------------------------------------------------------------
-// wxDropTarget
-// ----------------------------------------------------------------------------
+                gtk_selection_data_set( selection_data,
+                                        selection_data->target,
+                                        8,   // 8-bit
+                                        d,
+                                        size );

 
 

-wxDropTarget::wxDropTarget()
-{
-}
+#if wxUSE_THREADS
+    /* enable GUI threads */
+#endif

 
 

-wxDropTarget::~wxDropTarget()
-{
+    delete[] d;

 }
 
 }
 

-void wxDropTarget::UnregisterWidget( GtkWidget *widget )
+//----------------------------------------------------------------------------
+// "drag_data_delete"
+//----------------------------------------------------------------------------
+
+static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
+                                     GdkDragContext *context,
+                                     wxDropSource *WXUNUSED(drop_source) )

 {
 {

-    if (!widget) return;
-  
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-      GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this );
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-    gtk_widget_dnd_drop_set( widget, FALSE, (gchar **) NULL, 0, FALSE );
+    // printf( "Drag source: drag_data_delete\n" );

 }
 
 }
 

-void wxDropTarget::RegisterWidget( GtkWidget *widget )
+//----------------------------------------------------------------------------
+// "drag_begin"
+//----------------------------------------------------------------------------
+
+static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
+                               GdkDragContext     *WXUNUSED(context),
+                               wxDropSource       *WXUNUSED(drop_source) )

 {
 {

-    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;
-           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 );
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    // printf( "Drag source: drag_begin.\n" );

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+// "drag_end"
+//----------------------------------------------------------------------------

 
 

-bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
+static void source_drag_end( GtkWidget          *WXUNUSED(widget),
+                             GdkDragContext     *WXUNUSED(context),
+                             wxDropSource       *drop_source )

 {
 {

-    OnDropText( x, y, (const char*)data );
-    return TRUE;
-}
+    if (g_isIdle) wxapp_install_idle_handler();

 
 

-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;
-}
+    // printf( "Drag source: drag_end.\n" );

 
 

-size_t wxTextDropTarget::GetFormatCount() const
-{
-    return 1;
+    drop_source->m_waiting = FALSE;

 }
 
 }
 

-wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
+//-----------------------------------------------------------------------------
+// "configure_event" from m_iconWindow
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )

 {
 {

-    return wxDF_TEXT;
-}
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
+    source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );

 
 

-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 0;

 }
 
 }
 

-bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
+//---------------------------------------------------------------------------
+// wxDropSource
+//---------------------------------------------------------------------------
+
+wxDropSource::wxDropSource(wxWindow *win,
+                           const wxIcon &iconCopy,
+                           const wxIcon &iconMove,
+                           const wxIcon &iconNone)

 {
 {

-    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;
-    }
+    m_waiting = TRUE;

 
 

-    bool ret = OnDropFiles( x, y, 1, files ); 
-  
-    free( files );
-  
-    return ret;
-}
+    m_iconWindow = (GtkWidget*) NULL;

 
 

-size_t wxFileDropTarget::GetFormatCount() const
-{
-    return 1;
+    m_window = win;
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;
+
+    m_retValue = wxDragCancel;
+
+    SetIcons(iconCopy, iconMove, iconNone);

 }
 
 }
 

-wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
+wxDropSource::wxDropSource(wxDataObject& data,
+                           wxWindow *win,
+                           const wxIcon &iconCopy,
+                           const wxIcon &iconMove,
+                           const wxIcon &iconNone)

 {
 {

-    return wxDF_FILENAME;
-}
+    m_waiting = TRUE;

 
 

-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
+    SetData( data );

 
 

-static void
-shape_motion (GtkWidget      *widget, 
-             GdkEventMotion */*event*/);
-             
-//-----------------------------------------------------------------------------
-// drag request
+    m_iconWindow = (GtkWidget*) NULL;

 
 

-void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source )
-{
-  wxDataObject *data = source->m_data;
-  
-  size_t size = data->GetDataSize();
-  char *ptr = new char[size];
-  data->GetDataHere( ptr );
-  
-  gtk_widget_dnd_data_set( widget, event, ptr, size );
-  
-  delete ptr;
-  
-  source->m_retValue = wxDragCopy;
-}
+    m_window = win;
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;

 
 

-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 );
+    m_retValue = wxDragCancel;
+
+    SetIcons(iconCopy, iconMove, iconNone);

 }
 
 }
 

-wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
+void wxDropSource::SetIcons(const wxIcon &iconCopy,
+                            const wxIcon &iconMove,
+                            const wxIcon &iconNone)

 {
 {

-  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 );
+    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 wxDropSource::SetData( wxDataObject &data )
+wxDropSource::~wxDropSource()

 {
 {

-  m_data = &data;  

 }
 
 }
 

-wxDropSource::~wxDropSource(void)
+void wxDropSource::PrepareIcon( int action, GdkDragContext *context )

 {
 {

-//  if (m_data) delete m_data;
+    // get the right icon to display
+    wxIcon *icon = NULL;
+    if ( action & GDK_ACTION_MOVE )
+        icon = &m_iconMove;
+    else if ( action & GDK_ACTION_COPY )
+        icon = &m_iconCopy;
+    else
+        icon = &m_iconNone;

 
 

-  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;
-  if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
-  
-  static GtkWidget *drag_icon = NULL;
-  static GtkWidget *drop_icon = 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 );
-  
-/*
-    shape_motion( drag_icon, (GdkEventMotion *)NULL );
-    shape_motion( drop_icon, (GdkEventMotion *)NULL );
-*/
+    GdkBitmap *mask;
+    if ( icon->GetMask() )
+        mask = icon->GetMask()->GetBitmap();
+    else
+        mask = (GdkBitmap *)NULL;
+
+    GdkPixmap *pixmap = icon->GetPixmap();
+
+    gint width,height;
+    gdk_window_get_size (pixmap, &width, &height);
+
+    GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
+#ifndef __WXGTK20__
+    gtk_widget_push_visual (gdk_colormap_get_visual (colormap));
+#endif
+    gtk_widget_push_colormap (colormap);
+
+    m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
+    gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+    gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE);
+
+#ifndef __WXGTK20__
+    gtk_widget_pop_visual ();
+#endif
+    gtk_widget_pop_colormap ();
+
+    gtk_widget_set_usize (m_iconWindow, width, height);
+    gtk_widget_realize (m_iconWindow);
+
+    gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event",
+        GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this );

 
 

-  while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield();
-  
-  UnregisterWindow();
-  
-  g_blockEventsOnDrag = FALSE;
-  
-  return m_retValue;
+    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;
+
+    // disabled for now
+    g_blockEventsOnDrag = TRUE;
+
+    RegisterWindow();

 
 

-  wxString formats;
-    
-  wxDataFormat df = m_data->GetPreferredFormat();
-  
-    switch (df) 
+    m_waiting = TRUE;
+
+    GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) 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;
-      default:
-        break;
+        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 );

     }
     }

-  
-  char *str = WXSTRINGCAST formats;
-  
-  gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 );
+    delete[] array;
+
+    GdkEventMotion event;
+    event.window = m_widget->window;
+    int x = 0;
+    int y = 0;
+    GdkModifierType state;
+    gdk_window_get_pointer( event.window, &x, &y, &state );
+    event.x = x;
+    event.y = y;
+    event.state = state;
+    event.time = (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 */
+#endif

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event",
-    GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this );
-}
+    /* don't start dragging if no button is down */
+    if (button_number)
+    {
+        int action = GDK_ACTION_COPY;
+        if ( flags & wxDrag_AllowMove )
+            action |= GDK_ACTION_MOVE;

 
 

-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,
+                button_number,  /* number of mouse button which started drag */
+                (GdkEvent*) &event );

 
 

-/*
- * Shaped Windows
- */
-static GdkWindow *root_win = NULL;
+        m_dragContext = context;

 
 

-typedef struct _cursoroffset {gint x,y;} CursorOffset;
+        PrepareIcon( action, 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),
-                   NULL, NULL, 0);
-}
+        while (m_waiting)
+            gtk_main_iteration();

 
 

+        m_retValue = ConvertFromGTK(context->action);
+        if ( m_retValue == wxDragNone )
+            m_retValue = wxDragCancel;
+    }

 
 

-static void
-shape_released (GtkWidget *widget)
-{
-  gtk_grab_remove (widget);
-  gdk_pointer_ungrab (0);
-}
+#if wxUSE_THREADS
+    /* re-enable GUI threads */
+#endif

 
 

-static void
-shape_motion (GtkWidget      *widget, 
-             GdkEventMotion */*event*/)
-{
-  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);
+    g_blockEventsOnDrag = FALSE;
+
+    UnregisterWindow();
+
+    return m_retValue;

 }
 
 }
 

-GtkWidget *
-shape_create_icon (char     **data,
-                  gint      x,
-                  gint      y,
-                  gint      px,
-                  gint      py,
-                  gint      window_type)
+void wxDropSource::RegisterWindow()

 {
 {

-  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;

 
 

+    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 );

 
 

+}

 
 

+void wxDropSource::UnregisterWindow()
+{
+    if (!m_widget) return;

 
 

-#endif 
-       // NEW_GTK_DND_CODE
-       
+    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
+      // wxUSE_DRAG_AND_DROP