]> 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
* Fixed a compilation problem on Windows
[wxWidgets.git] / src / gtk / dnd.cpp
diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index a9fa2f763ad477fb8f449ba5b2291dbdd5971034..ae53201b1bdf172955d696297206f4d21b3da3c2 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -12,550 +12,837 @@
 #endif
 
 #include "wx/dnd.h"
 #endif
 
 #include "wx/dnd.h"
+
+#if wxUSE_DRAG_AND_DROP
+
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
-#include <wx/intl.h>
+#include "wx/intl.h"
+#include "wx/utils.h"
 
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "gdk/gdkprivate.h"
 
 #include "gdk/gdkprivate.h"
 
-#include <X11/Xlib.h>
+#include "gtk/gtkdnd.h"
+#include "gtk/gtkselection.h"
 
 
-// ----------------------------------------------------------------------------
-// global
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+// global data
+//----------------------------------------------------------------------------
 
 extern bool g_blockEventsOnDrag;
 
 
 extern bool g_blockEventsOnDrag;
 
+//----------------------------------------------------------------------------
+// standard icons
+//----------------------------------------------------------------------------
+
+/* XPM */
+static char * gv_xpm[] = {
+"40 34 3 1",
+"      s None c None",
+".     c black",
+"X     c white",
+"                                        ",
+"                                        ",
+"                  ......                ",
+"                ..XXXXXX..              ",
+"               .XXXXXXXXXX.             ",
+"              .XXXXXXXXXXXX.            ",
+"              .XXXXXXXXXXXX.            ",
+"             .XXXXXXXXXXXXXX.           ",
+"             .XXX..XXXX..XXX.           ",
+"          ....XX....XX....XX.           ",
+"         .XXX.XXX..XXXX..XXX....        ",
+"        .XXXXXXXXXXXXXXXXXXX.XXX.       ",
+"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
+"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
+"         ..XXXXXXXXXXXXXXXXXXXXXX.      ",
+"           .XXXXXXXXXXXXXXXXXX...       ",
+"           ..XXXXXXXXXXXXXXXX.          ",
+"            .XXXXXXXXXXXXXXXX.          ",
+"            .XXXXXXXXXXXXXXXX.          ",
+"            .XXXXXXXXXXXXXXXXX.         ",
+"            .XXXXXXXXXXXXXXXXX.         ",
+"            .XXXXXXXXXXXXXXXXXX.        ",
+"            .XXXXXXXXXXXXXXXXXXX.       ",
+"           .XXXXXXXXXXXXXXXXXXXXX.      ",
+"           .XXXXXXXXXXXXXX.XXXXXXX.     ",
+"          .XXXXXXX.XXXXXXX.XXXXXXX.     ",
+"         .XXXXXXXX.XXXXXXX.XXXXXXX.     ",
+"         .XXXXXXX...XXXXX...XXXXX.      ",
+"         .XXXXXXX.  .....   .....       ",
+"         ..XXXX..                       ",
+"           ....                         ",
+"                                        ",
+"                                        ",
+"                                        "};
+                             
+/* XPM */
+static char * page_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 5 1",
+/* colors */
+"      s None  c None",
+".     c black",
+"X     c wheat",
+"o     c tan",
+"O     c #6699FF",
+/* 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.   ",
+"    .........................   "};
+                             
+                             
 
 
-#if (GTK_MINOR_VERSION == 1)
-#if (GTK_MICRO_VERSION >= 3)
-#define NEW_GTK_DND_CODE
-#endif
-#endif
-
-#ifdef NEW_GTK_DND_CODE
+// ----------------------------------------------------------------------------
+// "drag_leave"
+// ----------------------------------------------------------------------------
 
 
-wxDropTarget::wxDropTarget()
+static void target_drag_leave( GtkWidget *WXUNUSED(widget),
+                              GdkDragContext *context,
+                              guint WXUNUSED(time),
+                              wxDropTarget *drop_target )
 {
 {
+    /* 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 );
 }
 
 }
 
-wxDropTarget::~wxDropTarget()
-{
-}
+// ----------------------------------------------------------------------------
+// "drag_motion"
+// ----------------------------------------------------------------------------
 
 
-void wxDropTarget::UnregisterWidget( GtkWidget *widget )
+static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
+                                   GdkDragContext *context,
+                                   gint x,
+                                   gint y,
+                                   guint time,
+                                   wxDropTarget *drop_target )
 {
 {
-  if (!widget) return;
-  
-  // TODO
+    /* 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 );
+    
+    if (drop_target->m_firstMotion)
+    {
+        /* the first "drag_motion" event substitutes a "drag_enter" event */
+       drop_target->OnEnter();
+    }
+    
+    /* give program a chance to react (i.e. to say no by returning FALSE) */
+    bool ret = drop_target->OnMove( x, y );
+    
+    /* we don't yet handle which "actions" (i.e. copy or move)
+       the target accepts. so far we simply accept the
+       suggested action. TODO. */
+    if (ret)
+        gdk_drag_status( context, context->suggested_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;
 }
 
 }
 
-void wxDropTarget::RegisterWidget( GtkWidget *widget )
+// ----------------------------------------------------------------------------
+// "drag_drop"
+// ----------------------------------------------------------------------------
+
+static gboolean target_drag_drop( GtkWidget *widget,
+                                 GdkDragContext *context,
+                                 gint x,
+                                 gint y,
+                                 guint time,
+                                 wxDropTarget *drop_target )
 {
 {
-  if (!widget) return;
-  
-  wxString formats;
-  int valid = 0;
+    /* 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.. */
   
   
-  for ( size_t i = 0; i < GetFormatCount(); i++ )
-  {
-    wxDataFormat df = GetFormat( i );
-    switch (df) 
+    /* 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 );
+    
+    bool ret = drop_target->OnDrop( x, y );
+    
+    if (!ret)
     {
     {
-      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;
+        /* cancel the whole thing */
+        gtk_drag_finish( context,
+                         FALSE,        /* no success */
+                         FALSE,        /* don't delete data on dropping side */
+                         time );
     }
     }
-  }
-  
-  char *str = WXSTRINGCAST formats;
-  
-  // TODO
+    
+    /* 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;
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
-// wxTextDropTarget
+// "drag_data_received"
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 
-bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
+static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
+                                      GdkDragContext *context,
+                                      gint x,
+                                      gint y,
+                                      GtkSelectionData *data,
+                                      guint WXUNUSED(info),
+                                      guint time,
+                                      wxDropTarget *drop_target )
 {
 {
-  OnDropText( x, y, (const char*)data );
-  return TRUE;
+    /* Owen Taylor: "call gtk_drag_finish() with
+       success == TRUE" */
+
+//    printf( "data received.\n" );
+       
+    if ((data->length <= 0) || (data->format != 8))
+    {
+        /* negative data length and non 8-bit data format
+           qualifies for junk */
+        gtk_drag_finish (context, FALSE, FALSE, time);
+       
+       return;
+    }
+    
+    /* inform the wxDropTarget about the current GtkSelectionData.
+       this is only valid for the duration of this call */
+    drop_target->SetDragData( data );
+    
+    if (drop_target->OnData( x, y ))
+    {
+       /* tell GTK that data transfer was successfull */
+        gtk_drag_finish( context, TRUE, FALSE, time );
+    }
+    else
+    {
+       /* tell GTK that data transfer was not successfull */
+        gtk_drag_finish( context, FALSE, FALSE, time );
+    }
+    
+    /* after this, invalidate the drop_target's drag data */
+    drop_target->SetDragData( (GtkSelectionData*) NULL );
 }
 
 }
 
-bool wxTextDropTarget::OnDropText( long x, long y, const char *psz )
+//----------------------------------------------------------------------------
+// wxDropTarget
+//----------------------------------------------------------------------------
+
+wxDropTarget::wxDropTarget()
 {
 {
-  printf( "Got dropped text: %s.\n", psz );
-  printf( "At x: %d, y: %d.\n", (int)x, (int)y );
-  return TRUE;
+    m_firstMotion = TRUE;
+    m_dragContext = (GdkDragContext*) NULL;
+    m_dragWidget = (GtkWidget*) NULL;
+    m_dragData = (GtkSelectionData*) NULL;
+    m_dragTime = 0;
 }
 
 }
 
-size_t wxTextDropTarget::GetFormatCount() const
+wxDropTarget::~wxDropTarget()
 {
 {
-  return 1;
 }
 
 }
 
-wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
+void wxDropTarget::OnEnter()
 {
 {
-  return wxDF_TEXT;
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
-
-bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] )
+void wxDropTarget::OnLeave()
 {
 {
-  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;
 }
 
 }
 
-bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
+bool wxDropTarget::OnMove( int WXUNUSED(x), int 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;
+    return TRUE;
 }
 
 }
 
-size_t wxFileDropTarget::GetFormatCount() const
+bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-  return 1;
+    return FALSE;
 }
 
 }
 
-wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
+bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-  return wxDF_FILENAME;
+    return FALSE;
 }
 
 }
 
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
-
-wxDropSource::wxDropSource( wxWindow *win )
+bool wxDropTarget::RequestData( wxDataFormat format )
 {
 {
-  g_blockEventsOnDrag = TRUE;
+    if (!m_dragContext) return FALSE;
+    if (!m_dragWidget) return FALSE;
+    
+    /* this should trigger an "drag_data_received" event */
+    gtk_drag_get_data( m_dragWidget, 
+                      m_dragContext,
+                      format.GetAtom(),
+                      m_dragTime );
+                      
+    return TRUE;
+}
+
+bool wxDropTarget::IsSupported( wxDataFormat format )
+{ 
+    if (!m_dragContext) return FALSE;
+    
+    GList *child = m_dragContext->targets;
+    while (child)
+    {
+        GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
   
   
-  m_window = win;
-  m_widget = win->m_widget;
-  if (win->m_wxwindow) m_widget = win->m_wxwindow;
+//        char *name = gdk_atom_name( formatAtom );
+//        if (name) printf( "Format available: %s.\n", name );
   
   
-  m_data = (wxDataObject *) NULL;
-  m_retValue = wxDragCancel;
+        if (formatAtom == format.GetAtom()) return TRUE;
+        child = child->next;
+    }
 
 
-  m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-  m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    return FALSE;
 }
 }
-
-wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
+  
+bool wxDropTarget::GetData( wxDataObject *data_object )
 {
 {
-  g_blockEventsOnDrag = TRUE;
+    if (!m_dragData) return FALSE;
+    
+    if (m_dragData->target !=  data_object->GetFormat().GetAtom()) return FALSE;
+       
+    if (data_object->GetFormat().GetType() == wxDF_TEXT)
+    {
+        wxTextDataObject *text_object = (wxTextDataObject*)data_object;
+        text_object->SetText( (const char*)m_dragData->data );
+    } else
+       
+    if (data_object->GetFormat().GetType() == wxDF_FILENAME)
+    {
+    } else
+       
+    if (data_object->GetFormat().GetType() == wxDF_PRIVATE)
+    {
+       wxPrivateDataObject *priv_object = (wxPrivateDataObject*)data_object;
+       priv_object->SetData( (const char*)m_dragData->data, (size_t)m_dragData->length );
+    }
+    
+    return TRUE;
+}
   
   
-  m_window = win;
-  m_widget = win->m_widget;
-  if (win->m_wxwindow) m_widget = win->m_wxwindow;
-  m_retValue = wxDragCancel;
+void wxDropTarget::UnregisterWidget( GtkWidget *widget )
+{
+    wxCHECK_RET( widget != NULL, _T("unregister widget is NULL") );
   
   
-  m_data = &data;
+    gtk_drag_dest_unset( widget );
+                    
+    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
+                     GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
 
 
-  m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-  m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-}
-
-void wxDropSource::SetData( wxDataObject &data )
-{
-  m_data = &data;  
-}
+    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
+                     GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
 
 
-wxDropSource::~wxDropSource(void)
-{
-//  if (m_data) delete m_data;
+    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
+                     GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
 
 
-  g_blockEventsOnDrag = FALSE;
+    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();
+    wxCHECK_RET( widget != NULL, _T("register widget is NULL") );
   
   
-  // TODO
+    /* 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. */
   
   
-  UnregisterWindow();
-  
-  g_blockEventsOnDrag = FALSE;
-  
-  return m_retValue;
+    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)
+//-------------------------------------------------------------------------
+// wxTextDropTarget
+//-------------------------------------------------------------------------
+
+bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-  if (!m_data) return;
+    return IsSupported( wxDF_TEXT );
+}
 
 
-  wxString formats;
-    
-  wxDataFormat df = m_data->GetPreferredFormat();
-  
-    switch (df) 
+bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
+{
+    if (IsSupported( wxDF_TEXT ))
     {
     {
-      case wxDF_TEXT: 
-        formats += "text/plain";
-       break;
-      case wxDF_FILENAME:
-        formats += "file:ALL";
-       break;
-      default:
-        break;
+        RequestData( wxDF_TEXT );
+       return TRUE;
     }
     }
-  
-  char *str = WXSTRINGCAST formats;
-  
-  // TODO
+    
+    return FALSE;
 }
 
 }
 
-void wxDropSource::UnregisterWindow(void)
+bool wxTextDropTarget::OnData( int x, int y )
 {
 {
-  if (!m_widget) return;
-  
-  // TODO
+    wxTextDataObject data;
+    if (!GetData( &data )) return FALSE;
+    
+    OnDropText( x, y, data.GetText() );
+    
+    return TRUE;
 }
 
 }
 
-#else
-
-// ----------------------------------------------------------------------------
-// wxDropTarget
-// ----------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+// wxPrivateDropTarget
+//-------------------------------------------------------------------------
 
 
-wxDropTarget::wxDropTarget()
+wxPrivateDropTarget::wxPrivateDropTarget()
 {
 {
+    m_id = wxTheApp->GetAppName();
 }
 
 }
 
-wxDropTarget::~wxDropTarget()
+wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id )
 {
 {
+    m_id = id;
 }
 
 }
 
-void wxDropTarget::UnregisterWidget( GtkWidget *widget )
+bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-  if (!widget) return;
-  
-  gtk_widget_dnd_drop_set( widget, FALSE, (gchar **) NULL, 0, FALSE );
+    return IsSupported( m_id );
 }
 
 }
 
-void wxDropTarget::RegisterWidget( GtkWidget *widget )
+bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-  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;
+    if (!IsSupported( m_id ))
+    { 
+        RequestData( m_id );
+        return FALSE;
     }
     }
-  }
-  
-  char *str = WXSTRINGCAST formats;
-  
-  gtk_widget_dnd_drop_set( widget, TRUE, &str, valid, FALSE );
+    
+    return FALSE;
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
-
-bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
+bool wxPrivateDropTarget::OnData( int x, int y )
 {
 {
-  OnDropText( x, y, (const char*)data );
-  return TRUE;
+    if (!IsSupported( m_id )) return FALSE;
+    
+    wxPrivateDataObject data;
+    if (!GetData( &data )) return FALSE;
+    
+    OnDropData( x, y, data.GetData(), data.GetSize() );
+    
+    return TRUE;
 }
 
 }
 
-bool wxTextDropTarget::OnDropText( long x, long y, const char *psz )
+//----------------------------------------------------------------------------
+// A drop target which accepts files (dragged from File Manager or Explorer)
+//----------------------------------------------------------------------------
+
+bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-  printf( "Got dropped text: %s.\n", psz );
-  printf( "At x: %d, y: %d.\n", (int)x, (int)y );
-  return TRUE;
+    return IsSupported( wxDF_FILENAME );
 }
 
 }
 
-size_t wxTextDropTarget::GetFormatCount() const
+bool wxFileDropTarget::OnDrop( int x, int y )
 {
 {
-  return 1;
+    if (IsSupported( wxDF_FILENAME ))
+    {
+        RequestData( wxDF_FILENAME );
+       return TRUE;
+    }
+    
+    return FALSE;
 }
 
 }
 
-wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
+bool wxFileDropTarget::OnData( int x, int y )
 {
 {
-  return wxDF_TEXT;
+    wxFileDataObject data;
+    if (!GetData( &data )) return FALSE;
+
+    /* get number of substrings /root/mytext.txt/0/root/myothertext.txt/0/0 */
+    size_t number = 0;
+    size_t i;
+    size_t size = data.GetFiles().Length();
+    wxChar *text = WXSTRINGCAST data.GetFiles();
+    for ( i = 0; i < size; i++)
+        if (text[i] == 0) number++;
+
+    if (number == 0) return FALSE;
+    
+    wxChar **files = new wxChar*[number];
+  
+    text = WXSTRINGCAST data.GetFiles();
+    for (i = 0; i < number; i++)
+    {
+        files[i] = text;
+        int len = wxStrlen( text );
+        text += len+1;
+    }
+
+    OnDropFiles( x, y, number, files ); 
+  
+    free( files );
+    
+    return TRUE;
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------
 
 
-bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] )
+static void  
+source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
+                      GdkDragContext     *context,
+                      GtkSelectionData   *selection_data,
+                      guint               WXUNUSED(info),
+                      guint               WXUNUSED(time),
+                      wxDropSource       *drop_source )
 {
 {
-  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;
+//    char *name = gdk_atom_name( selection_data->target );
+//    if (name) printf( "Format requested: %s.\n", name );
+    
+    wxNode *node = drop_source->m_data->m_dataObjects.First();
+    while (node)
+    {
+        wxDataObject *data_object = (wxDataObject*) node->Data();
+       if (data_object->GetFormat().GetAtom() == selection_data->target)
+       {
+           size_t data_size = data_object->GetSize();
+           
+           if (data_size > 0)
+           {
+               guchar *buffer = new guchar[data_size];
+               data_object->WriteData( buffer );
+               
+                gtk_selection_data_set( selection_data,
+                                       selection_data->target,
+                                       8,   /* 8-bit */
+                                       buffer, 
+                                       data_size );
+                                       
+               free( buffer );
+               
+               /* so far only copy, no moves. TODO. */
+                drop_source->m_retValue = wxDragCopy;
+           
+               return;
+           }
+       }
+    
+        node = node->Next();
+    }
+    
+    drop_source->m_retValue = wxDragCancel;
 }
 }
+  
+//----------------------------------------------------------------------------
+// "drag_data_delete"
+//----------------------------------------------------------------------------
 
 
-bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
+static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
+                                    GdkDragContext     *WXUNUSED(context),
+                                    wxDropSource       *drop_source )
 {
 {
-  size_t number = 0;
-  char *text = (char*) data;
-  for (size_t i = 0; i < size; i++)
-    if (text[i] == 0) number++;
+//    printf( "Delete the data!\n" );
 
 
-  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;
+    drop_source->m_retValue = wxDragMove;
 }
 }
+  
+//----------------------------------------------------------------------------
+// "drag_begin"
+//----------------------------------------------------------------------------
 
 
-size_t wxFileDropTarget::GetFormatCount() const
+static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
+                              GdkDragContext     *WXUNUSED(context),
+                              wxDropSource       *WXUNUSED(drop_source) )
 {
 {
-  return 1;
+//    printf( "drag_begin.\n" );
 }
 }
+  
+//----------------------------------------------------------------------------
+// "drag_end"
+//----------------------------------------------------------------------------
 
 
-wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
+static void source_drag_end( GtkWidget          *WXUNUSED(widget),
+                            GdkDragContext     *WXUNUSED(context),
+                            wxDropSource       *drop_source )
 {
 {
-  return wxDF_FILENAME;
-}
+//    printf( "drag_end.\n" );
 
 
-//-------------------------------------------------------------------------
+    drop_source->m_waiting = FALSE;
+}
+  
+//---------------------------------------------------------------------------
 // wxDropSource
 // wxDropSource
-//-------------------------------------------------------------------------
+//---------------------------------------------------------------------------
 
 
-//-----------------------------------------------------------------------------
-// drag request
-
-void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source )
+wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
 {
 {
-  printf( "Data requested for dropping.\n" );
-  
-  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 );
+    g_blockEventsOnDrag = TRUE;
+    m_waiting = TRUE;
   
   
-  delete ptr;
+    m_window = win;
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;
   
   
-  source->m_retValue = wxDragCopy;
+    m_data = (wxDataBroker*) NULL;
+    m_retValue = wxDragCancel;
+
+    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
+    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    
+    m_goIcon = go;
+    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
+    m_stopIcon = stop;
+    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 
 }
 
-wxDropSource::wxDropSource( wxWindow *win )
+wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
 {
 {
-  g_blockEventsOnDrag = TRUE;
+    m_waiting = TRUE;
   
   
-  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_data = (wxDataObject *) NULL;
-  m_retValue = wxDragCancel;
+    if (data)
+    {
+        m_data = new wxDataBroker();
+       m_data->Add( data );
+    }
+    else
+    {
+        m_data = (wxDataBroker*) NULL;
+    }
 
 
-  m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-  m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
+    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    
+    m_goIcon = go;
+    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
+    m_stopIcon = stop;
+    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 
 }
 
-wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win )
+wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
 {
 {
-  g_blockEventsOnDrag = TRUE;
-  
-  m_window = win;
-  m_widget = win->m_widget;
-  if (win->m_wxwindow) m_widget = win->m_wxwindow;
-  m_retValue = wxDragCancel;
+    m_window = win;
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;
+    m_retValue = wxDragCancel;
   
   
-  m_data = &data;
+    m_data = data;
 
 
-  m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
-  m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
+    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+}
+
+void wxDropSource::SetData( wxDataObject *data )
+{
+    if (m_data) delete m_data;
+    
+    if (data)
+    {
+        m_data = new wxDataBroker();
+       m_data->Add( data );
+    }
+    else
+    {
+        m_data = (wxDataBroker*) NULL;
+    }
 }
 
 }
 
-void wxDropSource::SetData( wxDataObject &data )
+void wxDropSource::SetData( wxDataBroker *data )
 {
 {
-  m_data = &data;  
+    if (m_data) delete m_data;
+    
+    m_data = data;
 }
 
 wxDropSource::~wxDropSource(void)
 {
 }
 
 wxDropSource::~wxDropSource(void)
 {
-//  if (m_data) delete m_data;
+    if (m_data) delete m_data;
 
 
-  g_blockEventsOnDrag = FALSE;
+    g_blockEventsOnDrag = FALSE;
 }
    
 wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
 {
 }
    
 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;
+    wxASSERT_MSG( m_data, _T("wxDragSource: no data") );
   
   
-  GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window;
+    if (!m_data) return (wxDragResult) wxDragNone;
   
   
-  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() );
+    g_blockEventsOnDrag = TRUE;
   
   
-  gdk_dnd.dnd_grabbed = TRUE;
-  gdk_dnd.drag_really = 1;
-  
-  int x = 0;
-  int y = 0;
-  gdk_window_get_pointer( m_widget->window, &x, &y, (GdkModifierType *) NULL );
-  
-  gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE );
-  
-  while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield();
-  
-  UnregisterWindow();
-  
-  g_blockEventsOnDrag = FALSE;
-  
-  return m_retValue;
-}
-
-void wxDropSource::RegisterWindow(void)
-{
-  if (!m_data) return;
+    RegisterWindow();
+    
+    m_waiting = TRUE;
 
 
-  wxString formats;
+    GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
+    gtk_target_list_add( target_list, gdk_atom_intern( "STRING", FALSE ), 0, 0 );
     
     
-  wxDataFormat df = m_data->GetPreferredFormat();
-  
-    switch (df) 
+    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;
+    
+    /* GTK wants to know which button was pressed which caused the dragging */
+    int button_number = 0;
+    if (event.state & GDK_BUTTON1_MASK) button_number = 1;
+    else if (event.state & GDK_BUTTON2_MASK) button_number = 2;
+    else if (event.state & GDK_BUTTON3_MASK) button_number = 3;
+
+    /* don't start dragging if no button is down */
+    if (button_number)
     {
     {
-      case wxDF_TEXT: 
-        formats += "text/plain";
-       break;
-      case wxDF_FILENAME:
-        formats += "file:ALL";
-       break;
-      default:
-        break;
+        GdkDragContext *context = gtk_drag_begin( m_widget,
+                                              target_list,
+                                             GDK_ACTION_COPY,
+                                             button_number,  /* number of mouse button which started drag */
+                                             (GdkEvent*) &event );
+       
+        wxMask *mask = m_goIcon.GetMask();
+        GdkBitmap *bm = (GdkBitmap *) NULL;
+        if (mask) bm = mask->GetBitmap();
+       GdkPixmap *pm = m_goIcon.GetPixmap();
+       
+        gtk_drag_set_icon_pixmap( context,
+                                 gtk_widget_get_colormap( m_widget ),
+                                 pm,
+                                 bm,
+                                 0,
+                                 0 );
+    
+        gdk_flush();
+    
+        while (m_waiting) wxYield();
     }
     }
-  
-  char *str = WXSTRINGCAST formats;
-  
-  gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 );
 
 
-  gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event",
-    GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this );
+    g_blockEventsOnDrag = FALSE;
+    
+    UnregisterWindow();
+
+    return m_retValue;
 }
 
 }
 
-void wxDropSource::UnregisterWindow(void)
+void wxDropSource::RegisterWindow()
 {
 {
-  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 );
+    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 );
+
 }
 
 }
 
-#endif 
-       // NEW_GTK_DND_CODE
-       
+void wxDropSource::UnregisterWindow()
+{
+    if (!m_widget) return;
+    
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+                     GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this );
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+                     GTK_SIGNAL_FUNC(source_drag_data_delete), (gpointer) this );
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+                     GTK_SIGNAL_FUNC(source_drag_begin), (gpointer) this );
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+                     GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this );
+}
+
+#endif
+
+      // wxUSE_DRAG_AND_DROP
wxWidgets (Impactor)