]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/dnd.cpp
wxGTK's built-in dockable menu now give their
[wxWidgets.git] / src / gtk / dnd.cpp
index 08aa539a42d7757870df8644b0738d15600c906b..7ffdb34a1166cf3dc3f8f5a5d92df0d463f4eb1f 100644 (file)
 
 #include <X11/Xlib.h>
 
 
 #include <X11/Xlib.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 > 0)
 
 #include "gtk/gtkdnd.h"
 #include "gtk/gtkselection.h"
 
 #if (GTK_MINOR_VERSION > 0)
 
 #include "gtk/gtkdnd.h"
 #include "gtk/gtkselection.h"
 
+
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // "drag_leave"
 // ----------------------------------------------------------------------------
@@ -45,11 +136,21 @@ extern bool g_blockEventsOnDrag;
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
                               GdkDragContext *context,
                               guint WXUNUSED(time),
 static void target_drag_leave( GtkWidget *WXUNUSED(widget),
                               GdkDragContext *context,
                               guint WXUNUSED(time),
-                              wxDropTarget *dt )
+                              wxDropTarget *drop_target )
 {
 {
-    dt->SetDragContext( context );
-    dt->OnLeave();
-    dt->SetDragContext( (GdkDragContext*) NULL );
+    /* 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 );
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -61,21 +162,38 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
                                    gint x,
                                    gint y,
                                    guint time,
                                    gint x,
                                    gint y,
                                    guint time,
-                                   wxDropTarget *dt )
+                                   wxDropTarget *drop_target )
 {
 {
-    dt->SetDragContext( context );
+    /* 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 (dt->OnMove( x, y ))
-    {
-        gdk_drag_status( context, context->suggested_action, time );
-    }
-    else
+    if (drop_target->m_firstMotion)
     {
     {
-        gdk_drag_status( context, (GdkDragAction)0, time );
+        /* the first "drag_motion" event substitutes a "drag_enter" event */
+       drop_target->OnEnter();
     }
     
     }
     
-    dt->SetDragContext( (GdkDragContext*) NULL );
-    return TRUE;
+    /* 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;
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -86,18 +204,53 @@ static gboolean target_drag_drop( GtkWidget *widget,
                                  GdkDragContext *context,
                                  gint x,
                                  gint y,
                                  GdkDragContext *context,
                                  gint x,
                                  gint y,
-                                 guint time )
+                                 guint time,
+                                 wxDropTarget *drop_target )
 {
 {
-    printf( "drop at: %d,%d.\n", x, y );
+    /* 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.. */
   
   
-    if (context->targets)
+    /* 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)
     {
     {
-        gtk_drag_get_data( widget, 
-                          context, 
-                          GPOINTER_TO_INT (context->targets->data), 
-                          time );
+        /* cancel the whole thing */
+        gtk_drag_finish( context,
+                         FALSE,        /* no success */
+                         FALSE,        /* don't delete data on dropping side */
+                         time );
     }
     }
-    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;
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -110,27 +263,53 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
                                       gint y,
                                       GtkSelectionData *data,
                                       guint WXUNUSED(info),
                                       gint y,
                                       GtkSelectionData *data,
                                       guint WXUNUSED(info),
-                                      guint time )
+                                      guint time,
+                                      wxDropTarget *drop_target )
 {
 {
-    printf( "data receive at: %d,%d.\n", x, y );
-  
-    if ((data->length >= 0) && (data->format == 8))
+    /* 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 ))
     {
     {
-        wxString str = (const char*)data->data;
-        printf( "Received %s\n.", WXSTRINGCAST str );
+       /* tell GTK that data transfer was successfull */
         gtk_drag_finish( context, TRUE, FALSE, time );
         gtk_drag_finish( context, TRUE, FALSE, time );
-        return;
     }
     }
-  
-    gtk_drag_finish (context, FALSE, 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 );
 }
 
 }
 
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 // wxDropTarget
 // wxDropTarget
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 
 wxDropTarget::wxDropTarget()
 {
 
 wxDropTarget::wxDropTarget()
 {
+    m_firstMotion = TRUE;
+    m_dragContext = (GdkDragContext*) NULL;
+    m_dragWidget = (GtkWidget*) NULL;
+    m_dragData = (GtkSelectionData*) NULL;
+    m_dragTime = 0;
 }
 
 wxDropTarget::~wxDropTarget()
 }
 
 wxDropTarget::~wxDropTarget()
@@ -145,37 +324,84 @@ void wxDropTarget::OnLeave()
 {
 }
 
 {
 }
 
-bool wxDropTarget::OnMove( int x, int y )
+bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-    printf( "mouse move %d  %d.\n", x, y );
     return TRUE;
 }
 
     return TRUE;
 }
 
-bool wxDropTarget::OnDrop( int x, int y )
+bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-    printf( "mouse move %d  %d.\n", x, y );
-    return TRUE;
+    return FALSE;
 }
 
 }
 
-bool wxDropTarget::IsSupported( wxDataFormat format )
+bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
+    return FALSE;
+}
+
+bool wxDropTarget::RequestData( wxDataFormat format )
+{
+    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;
 }
     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);
+  
+//        char *name = gdk_atom_name( formatAtom );
+//        if (name) printf( "Format available: %s.\n", name );
+  
+        if (formatAtom == format.GetAtom()) return TRUE;
+        child = child->next;
+    }
+
+    return FALSE;
+}
   
   
-bool wxDropTarget::GetData( wxDataObject *data )
+bool wxDropTarget::GetData( wxDataObject *data_object )
 {
 {
-    return FALSE;
+    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;
 }
   
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 {
     wxCHECK_RET( widget != NULL, "unregister widget is NULL" );
   
 }
   
 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_drag_dest_unset( widget );
                     
     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_leave), (gpointer) this );
@@ -194,17 +420,21 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
 {
     wxCHECK_RET( widget != NULL, "register widget is NULL" );
   
 {
     wxCHECK_RET( widget != NULL, "register widget is NULL" );
   
-    GtkTargetEntry format;
-    format.info = 0;
-    format.flags = 0;
-    char buf[100];
-    strcpy( buf, "text/plain" );
+    /* 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,
   
     gtk_drag_dest_set( widget,
-                    GTK_DEST_DEFAULT_ALL,
-                    &format, 
-                    1,
-                    (GdkDragAction)(GDK_ACTION_COPY | GDK_ACTION_MOVE) ); 
+                      (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_leave",
                      GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
@@ -225,17 +455,28 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
 
 bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
 
 bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
-    return IsSupported( wxDF_TEXT );  // same as "TEXT"
+    return IsSupported( wxDF_TEXT );
 }
 
 }
 
-bool wxTextDropTarget::OnDrop( int x, int y )
+bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-    if (!IsSupported( wxDF_TEXT )) return FALSE;
+    if (IsSupported( wxDF_TEXT ))
+    {
+        RequestData( wxDF_TEXT );
+       return TRUE;
+    }
+    
+    return FALSE;
+}
 
 
+bool wxTextDropTarget::OnData( int x, int y )
+{
     wxTextDataObject data;
     if (!GetData( &data )) return FALSE;
     
     wxTextDataObject data;
     if (!GetData( &data )) return FALSE;
     
-    return OnDropText( x, y, data.GetText() );
+    OnDropText( x, y, data.GetText() );
+    
+    return TRUE;
 }
 
 //-------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------
@@ -257,14 +498,27 @@ bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
     return IsSupported( m_id );
 }
 
     return IsSupported( m_id );
 }
 
-bool wxPrivateDropTarget::OnDrop( int x, int y )
+bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
 {
 {
-    if (!IsSupported( m_id )) return FALSE;
+    if (!IsSupported( m_id ))
+    { 
+        RequestData( m_id );
+        return FALSE;
+    }
+    
+    return FALSE;
+}
 
 
+bool wxPrivateDropTarget::OnData( int x, int y )
+{
+    if (!IsSupported( m_id )) return FALSE;
+    
     wxPrivateDataObject data;
     if (!GetData( &data )) return FALSE;
     
     wxPrivateDataObject data;
     if (!GetData( &data )) return FALSE;
     
-    return OnDropData( x, y, data.GetData(), data.GetSize() );
+    OnDropData( x, y, data.GetData(), data.GetSize() );
+    
+    return TRUE;
 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------
@@ -273,13 +527,22 @@ bool wxPrivateDropTarget::OnDrop( int x, int y )
 
 bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
 
 bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
-    return IsSupported( wxDF_FILENAME );  // same as "file:ALL"
+    return IsSupported( wxDF_FILENAME );
 }
 
 bool wxFileDropTarget::OnDrop( int x, int y )
 {
 }
 
 bool wxFileDropTarget::OnDrop( int x, int y )
 {
-    if (!IsSupported( wxDF_FILENAME )) return FALSE;
+    if (IsSupported( wxDF_FILENAME ))
+    {
+        RequestData( wxDF_FILENAME );
+       return TRUE;
+    }
     
     
+    return FALSE;
+}
+
+bool wxFileDropTarget::OnData( int x, int y )
+{
     wxFileDataObject data;
     if (!GetData( &data )) return FALSE;
 
     wxFileDataObject data;
     if (!GetData( &data )) return FALSE;
 
@@ -291,7 +554,7 @@ bool wxFileDropTarget::OnDrop( int x, int y )
     for ( i = 0; i < size; i++)
         if (text[i] == 0) number++;
 
     for ( i = 0; i < size; i++)
         if (text[i] == 0) number++;
 
-    if (number == 0) return TRUE;    
+    if (number == 0) return FALSE;
     
     char **files = new char*[number];
   
     
     char **files = new char*[number];
   
@@ -303,19 +566,293 @@ bool wxFileDropTarget::OnDrop( int x, int y )
         text += len+1;
     }
 
         text += len+1;
     }
 
-    bool ret = OnDropFiles( x, y, number, files ); 
+    OnDropFiles( x, y, number, files ); 
   
     free( files );
   
     free( files );
+    
+    return TRUE;
+}
+
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------
+
+static void  
+source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
+                      GdkDragContext     *context,
+                      GtkSelectionData   *selection_data,
+                      guint               WXUNUSED(info),
+                      guint               WXUNUSED(time),
+                      wxDropSource       *drop_source )
+{
+//    char *name = gdk_atom_name( selection_data->target );
+//    if (name) printf( "Format requested: %s.\n", name );
+    
+    wxNode *node = drop_source->m_data->m_dataObjects.First();
+    while (node)
+    {
+        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;
+}
   
   
-    return ret;
+//----------------------------------------------------------------------------
+// "drag_data_delete"
+//----------------------------------------------------------------------------
+
+static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
+                                    GdkDragContext     *WXUNUSED(context),
+                                    wxDropSource       *drop_source )
+{
+//    printf( "Delete the data!\n" );
+
+    drop_source->m_retValue = wxDragMove;
 }
 }
+  
+//----------------------------------------------------------------------------
+// "drag_begin"
+//----------------------------------------------------------------------------
 
 
-//-------------------------------------------------------------------------
+static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
+                              GdkDragContext     *WXUNUSED(context),
+                              wxDropSource       *WXUNUSED(drop_source) )
+{
+//    printf( "drag_begin.\n" );
+}
+  
+//----------------------------------------------------------------------------
+// "drag_end"
+//----------------------------------------------------------------------------
+
+static void source_drag_end( GtkWidget          *WXUNUSED(widget),
+                            GdkDragContext     *WXUNUSED(context),
+                            wxDropSource       *drop_source )
+{
+//    printf( "drag_end.\n" );
+
+    drop_source->m_waiting = FALSE;
+}
+  
+//---------------------------------------------------------------------------
 // wxDropSource
 // wxDropSource
-//-------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+wxDropSource::wxDropSource( 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_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( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
+{
+    m_waiting = TRUE;
+  
+    m_window = win;
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;
+    m_retValue = wxDragCancel;
+  
+    if (data)
+    {
+        m_data = new wxDataBroker();
+       m_data->Add( data );
+    }
+    else
+    {
+        m_data = (wxDataBroker*) NULL;
+    }
+
+    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( wxDataBroker *data, wxWindow *win )
+{
+    m_window = win;
+    m_widget = win->m_widget;
+    if (win->m_wxwindow) m_widget = win->m_wxwindow;
+    m_retValue = wxDragCancel;
+  
+    m_data = data;
+
+    m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
+    m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+}
+
+void wxDropSource::SetData( wxDataObject *data )
+{
+    if (m_data) delete m_data;
+    
+    if (data)
+    {
+        m_data = new wxDataBroker();
+       m_data->Add( data );
+    }
+    else
+    {
+        m_data = (wxDataBroker*) NULL;
+    }
+}
+
+void wxDropSource::SetData( wxDataBroker *data )
+{
+    if (m_data) delete m_data;
+    
+    m_data = data;
+}
+
+wxDropSource::~wxDropSource(void)
+{
+    if (m_data) delete m_data;
+
+    g_blockEventsOnDrag = FALSE;
+}
+   
+wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
+{
+    wxASSERT_MSG( m_data, "wxDragSource: no data" );
+  
+    if (!m_data) return (wxDragResult) wxDragNone;
+  
+    g_blockEventsOnDrag = TRUE;
+  
+    RegisterWindow();
+    
+    m_waiting = TRUE;
+
+    GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
+    gtk_target_list_add( target_list, gdk_atom_intern( "STRING", FALSE ), 0, 0 );
+    
+    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)
+    {
+        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();
+    }
+
+    g_blockEventsOnDrag = FALSE;
+    
+    UnregisterWindow();
+
+    return m_retValue;
+}
+
+void wxDropSource::RegisterWindow()
+{
+    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;
+    
+    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 );
+}
+
 
 #else  // NEW_CODE
 
 
 #else  // NEW_CODE
 
+//----------------------------------------------------------------------------
+// forward
+//----------------------------------------------------------------------------
+
 GtkWidget *shape_create_icon ( const wxIcon &shape,
                              gint      x,
                              gint      y,
 GtkWidget *shape_create_icon ( const wxIcon &shape,
                              gint      x,
                              gint      y,
@@ -323,92 +860,6 @@ GtkWidget *shape_create_icon ( const wxIcon &shape,
                              gint      py,
                              gint      window_type);
 
                              gint      py,
                              gint      window_type);
 
-/* XPM */
-static char * gv_xpm[] = {
-"40 34 3 1",
-"      s None c None",
-".     c black",
-"X     c white",
-"                                        ",
-"                                        ",
-"                  ......                ",
-"                ..XXXXXX..              ",
-"               .XXXXXXXXXX.             ",
-"              .XXXXXXXXXXXX.            ",
-"              .XXXXXXXXXXXX.            ",
-"             .XXXXXXXXXXXXXX.           ",
-"             .XXX..XXXX..XXX.           ",
-"          ....XX....XX....XX.           ",
-"         .XXX.XXX..XXXX..XXX....        ",
-"        .XXXXXXXXXXXXXXXXXXX.XXX.       ",
-"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
-"        .XXXXXXXXXXXXXXXXXXXXXXXX.      ",
-"         ..XXXXXXXXXXXXXXXXXXXXXX.      ",
-"           .XXXXXXXXXXXXXXXXXX...       ",
-"           ..XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXX.          ",
-"            .XXXXXXXXXXXXXXXXX.         ",
-"            .XXXXXXXXXXXXXXXXX.         ",
-"            .XXXXXXXXXXXXXXXXXX.        ",
-"            .XXXXXXXXXXXXXXXXXXX.       ",
-"           .XXXXXXXXXXXXXXXXXXXXX.      ",
-"           .XXXXXXXXXXXXXX.XXXXXXX.     ",
-"          .XXXXXXX.XXXXXXX.XXXXXXX.     ",
-"         .XXXXXXXX.XXXXXXX.XXXXXXX.     ",
-"         .XXXXXXX...XXXXX...XXXXX.      ",
-"         .XXXXXXX.  .....   .....       ",
-"         ..XXXX..                       ",
-"           ....                         ",
-"                                        ",
-"                                        ",
-"                                        "};
-                             
-/* XPM */
-static char * page_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"32 32 5 1",
-/* colors */
-"      s None  c None",
-".     c black",
-"X     c wheat",
-"o     c tan",
-"O     c #6699FF",
-/* pixels */
-"    ...................         ",
-"    .XXXXXXXXXXXXXXXXX..        ",
-"    .XXXXXXXXXXXXXXXXX.o.       ",
-"    .XXXXXXXXXXXXXXXXX.oo.      ",
-"    .XXXXXXXXXXXXXXXXX.ooo.     ",
-"    .XXXXXXXXXXXXXXXXX.oooo.    ",
-"    .XXXXXXXXXXXXXXXXX.......   ",
-"    .XXXXXOOOOOOOOOOXXXooooo.   ",
-"    .XXXXXXXXXXXXXXXXXXooooo.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOOOOXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXOOOOOOOOOOXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXOOOOOOOXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .XXXXXXXXXXXXXXXXXXXXXXX.   ",
-"    .........................   "};
-                             
-                             
 //-----------------------------------------------------------------------------
 // globals
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // globals
 //-----------------------------------------------------------------------------