More for wxPython 2.0b9 (hopefully the last...)

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index ff56d90299eaeaa436ba63bf66ae2a7756585584..7bef3e8f1cf32202dfce327c5839becaab39c122 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -25,7 +25,8 @@
 #include "gtk/gtk.h"
 #include "gdk/gdkprivate.h"
 
 #include "gtk/gtk.h"
 #include "gdk/gdkprivate.h"
 

-#include <X11/Xlib.h>
+#include "gtk/gtkdnd.h"
+#include "gtk/gtkselection.h"

 
 //----------------------------------------------------------------------------
 // global data
 
 //----------------------------------------------------------------------------
 // global data


@@ -123,10 +124,6 @@ static char * page_xpm[] = {
 "    .........................   "};
                              
                              
 "    .........................   "};
                              
                              

-#if (GTK_MINOR_VERSION > 0)
-
-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"

 
 // ----------------------------------------------------------------------------
 // "drag_leave"
 
 // ----------------------------------------------------------------------------
 // "drag_leave"


@@ -135,11 +132,21 @@ static char * page_xpm[] = {
 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 );

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


@@ -151,21 +158,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;

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


@@ -176,18 +200,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;

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


@@ -200,27 +259,55 @@ 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);
+       
+//     printf( "no data.\n" );
+       
+       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()


@@ -235,54 +322,90 @@ void wxDropTarget::OnLeave()
 {
 }
 
 {
 }
 

-bool wxDropTarget::OnMove( int x, int y )
+bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )

 {
 {

-    printf( "generic 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) )
+{
+    return FALSE;
+}
+
+bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )

 {
 {

-    printf( "generic drop %d  %d.\n", x, y );
+    return FALSE;
+}
+
+bool wxDropTarget::RequestData( wxDataFormat format )
+{
+    if (!m_dragContext) return FALSE;
+    if (!m_dragWidget) return FALSE;

     
     

+/*
+    wxPrintf( _T("format: %s.\n"), format.GetId().c_str() );
+    if (format.GetType() == wxDF_PRIVATE) wxPrintf( _T("private data.\n") );
+    if (format.GetType() == wxDF_TEXT) wxPrintf( _T("text data.\n") );
+*/
+
+    /* 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 )
 { 
     return TRUE;
 }
 
 bool wxDropTarget::IsSupported( wxDataFormat format )
 { 

-    printf( "generic is supported.\n" );
-    

     if (!m_dragContext) return FALSE;
     
     GList *child = m_dragContext->targets;
     while (child)
     {
         GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
     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 );
-
+  
+//        char *name = gdk_atom_name( formatAtom );
+//        if (name) printf( "Format available: %s.\n", name );
+  
+        if (formatAtom == format.GetAtom()) return TRUE;

         child = child->next;
     }
         child = child->next;
     }

-    
- 
-    return TRUE;
+
+    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 )
 {
 }
   
 void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 {

-    wxCHECK_RET( widget != NULL, "unregister widget is NULL" );
+    wxCHECK_RET( widget != NULL, _T("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 );


@@ -299,20 +422,23 @@ void wxDropTarget::UnregisterWidget( GtkWidget *widget )
 
 void wxDropTarget::RegisterWidget( GtkWidget *widget )
 {
 
 void wxDropTarget::RegisterWidget( GtkWidget *widget )
 {

-    wxCHECK_RET( widget != NULL, "register widget is NULL" );
+    wxCHECK_RET( widget != NULL, _T("register widget is NULL") );

   
   

-    GtkTargetEntry format;
-    format.info = 0;
-    format.flags = 0;
-    char buf[100];
-    strcpy( buf, "text/plain" );
-    format.target = buf;
+    /* 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 );


@@ -333,21 +459,28 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
 
 bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {
 
 bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
 {

-    printf( "text move.\n" );
-
-    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) )

 {
 {

-    printf( "text drop.\n" );
-
-    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;

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


@@ -369,14 +502,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;

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


@@ -385,13 +531,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;
 


@@ -399,518 +554,129 @@ bool wxFileDropTarget::OnDrop( int x, int y )
     size_t number = 0;
     size_t i;
     size_t size = data.GetFiles().Length();
     size_t number = 0;
     size_t i;
     size_t size = data.GetFiles().Length();

-    char *text = WXSTRINGCAST data.GetFiles();
+    wxChar *text = WXSTRINGCAST data.GetFiles();

     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];
+    wxChar **files = new wxChar*[number];

   
     text = WXSTRINGCAST data.GetFiles();
     for (i = 0; i < number; i++)
     {
         files[i] = text;
   
     text = WXSTRINGCAST data.GetFiles();
     for (i = 0; i < number; i++)
     {
         files[i] = text;

-        int len = strlen( text );
+        int len = wxStrlen( text );

         text += len+1;
     }
 
         text += len+1;
     }
 

-    bool ret = OnDropFiles( x, y, number, files ); 
+    OnDropFiles( x, y, number, files ); 

   
     free( files );
   
     free( files );

-  
-    return ret;
-}
-
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
-
-
-wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
-{
-    g_blockEventsOnDrag = TRUE;
-  
-    m_window = win;
-    m_widget = win->m_widget;
-    if (win->m_wxwindow) m_widget = win->m_wxwindow;
-  
-    m_data = (wxDataBroker*) NULL;
-    m_retValue = wxDragCancel;
-
-    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 );
+    return TRUE;

 }
 
 }
 

-wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
-{
-    g_blockEventsOnDrag = TRUE;
-  
-    m_window = win;
-    m_widget = win->m_widget;
-    if (win->m_wxwindow) m_widget = win->m_wxwindow;
-    m_retValue = wxDragCancel;
-  
-    if (data)
-    {
-        m_data = new wxDataBroker();
-       m_data->Add( data );
-    }
-    else
-    {
-        m_data = (wxDataBroker*) NULL;
-    }
-
-    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 );
-}
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------

 
 

-wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
+static void  
+source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
+                      GdkDragContext     *context,
+                      GtkSelectionData   *selection_data,
+                      guint               WXUNUSED(info),
+                      guint               WXUNUSED(time),
+                      wxDropSource       *drop_source )

 {
 {

-    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 );
-}
+//    printf( "Provide data!\n" );

 
 

-void wxDropSource::SetData( wxDataObject *data )
-{
-    if (m_data) delete m_data;
+//    char *name = gdk_atom_name( selection_data->target );
+//    if (name) printf( "Format requested: %s.\n", name );

     
     

-    if (data)
-    {
-        m_data = new wxDataBroker();
-       m_data->Add( data );
-    }
-    else
+    wxNode *node = drop_source->m_data->m_dataObjects.First();
+    while (node)

     {
     {

-        m_data = (wxDataBroker*) NULL;
+        wxDataObject *data_object = (wxDataObject*) node->Data();
+       if (data_object->GetFormat().GetAtom() == selection_data->target)
+       {
+//         printf( "format found.\n" );
+       
+           size_t data_size = data_object->GetSize();
+           
+           if (data_size > 0)
+           {
+//             printf( "data size: %d.\n", (int)data_size );
+           
+               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();

     }
     }

-}
-
-void wxDropSource::SetData( wxDataBroker *data )
-{
-    if (m_data) delete m_data;

     
     

-    m_data = data;
+    drop_source->m_retValue = wxDragCancel;

 }
 }

-
-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;
-  
-    static GtkWidget *drag_icon = (GtkWidget*) NULL;
-    static GtkWidget *drop_icon = (GtkWidget*) NULL;
-
-    GdkPoint hotspot_1 = {0,-5 };
-      
-    if (!drag_icon)
-    {
-/*
-         drag_icon = shape_create_icon ( m_stopIcon,
-                                        440, 140, 0,0, GTK_WINDOW_POPUP);
-         
-         gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy",
-                             GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                             &drag_icon);
-
-         gtk_widget_hide (drag_icon);
-*/
-    }
-      
-    GdkPoint hotspot_2 = {-5,-5};
-       
-    if (!drop_icon)
-    {
-/*
-         drop_icon = shape_create_icon ( m_goIcon,
-                                        440, 140, 0,0, GTK_WINDOW_POPUP);
-         
-         gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy",
-                             GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                             &drop_icon);
-
-         gtk_widget_hide (drop_icon);
-*/
-    }
-       
-
-    return FALSE;
-}
-
-void wxDropSource::RegisterWindow(void)
-{
-    if (!m_data) return;
-}
-
-void wxDropSource::UnregisterWindow(void)
-{
-    if (!m_widget) return;
-}
-
-
-#else  // NEW_CODE
-

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

-// forward
+// "drag_data_delete"

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

-GtkWidget *shape_create_icon ( const wxIcon &shape,
-                             gint      x,
-                             gint      y,
-                             gint      px,
-                             gint      py,
-                             gint      window_type);
-
-//-----------------------------------------------------------------------------
-// globals
-//-----------------------------------------------------------------------------
-
-wxDropSource *gs_currentDropSource = (wxDropSource*) NULL;
-
-//-----------------------------------------------------------------------------
-// "drop_enter_event"
-//-----------------------------------------------------------------------------
-
-static void gtk_target_enter_callback( GtkWidget *WXUNUSED(widget), 
-                                       GdkEventDropEnter *WXUNUSED(event), 
-                                      wxDropTarget *target )
+static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
+                                    GdkDragContext     *WXUNUSED(context),
+                                    wxDropSource       *drop_source )

 {
 {

-    if (target)
-        target->OnEnter();
-}
-
-//-----------------------------------------------------------------------------
-// "drop_leave_event"
-//-----------------------------------------------------------------------------
-
-static void gtk_target_leave_callback( GtkWidget *WXUNUSED(widget), 
-                                       GdkEventDropLeave *WXUNUSED(event), 
-                                      wxDropTarget *target )
-{
-    if (target)
-        target->OnLeave();
-}
-
-//-----------------------------------------------------------------------------
-// "drop_data_available_event"
-//-----------------------------------------------------------------------------
-
-static void gtk_target_callback( GtkWidget *widget, 
-                                 GdkEventDropDataAvailable *event, 
-                                wxDropTarget *target )
-{
-    if (target)
-    {
-        int x = 0;
-        int y = 0;
-        gdk_window_get_pointer( widget->window, &x, &y, (GdkModifierType *) NULL );
-/*
-        printf( "Drop data is of type %s.\n", event->data_type );
-*/
-        target->OnDrop( x, y, (const void*)event->data, (size_t)event->data_numbytes );
-    }
-
-/*
-    g_free (event->data);
-    g_free (event->data_type);
-*/
-}
-
-// ----------------------------------------------------------------------------
-// wxDropTarget
-// ----------------------------------------------------------------------------
-
-wxDropTarget::wxDropTarget()
-{
-    m_format = (wxDataFormat*) NULL;
-}
-
-wxDropTarget::~wxDropTarget()
-{
-    if (m_format) delete m_format;
-}
-
-wxDataFormat &wxDropTarget::GetFormat(size_t n) const
-{
-    return (*m_format);
-}
+//    printf( "Delete the data!\n" );

 
 

-void wxDropTarget::UnregisterWidget( GtkWidget *widget )
-{
-    if (!widget) return;
-  
-    gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
-      GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this );
-
-    gtk_widget_dnd_drop_set( widget, FALSE, (gchar **) NULL, 0, FALSE );
+    drop_source->m_retValue = wxDragMove;

 }
 }

-
-void wxDropTarget::RegisterWidget( GtkWidget *widget )
-{
-    wxString formats;
-    int valid = 0;

   
   

-    for ( size_t i = 0; i < GetFormatCount(); i++ )
-    {
-        switch (GetFormat(i).GetType()) 
-        {
-            case wxDF_TEXT:
-           {
-               if (i > 0) formats += ";";
-                formats += "text/plain";
-               valid++;
-               break;
-           }
-            case wxDF_FILENAME:
-           {
-               if (i > 0) formats += ";";
-                formats += "file:ALL";
-               valid++;
-               break;
-           }
-            case wxDF_PRIVATE:
-           {
-               if (i > 0) formats += ";";
-                wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this;
-                formats += pdt->GetId();
-               valid++;
-               break;
-           }
-            default:
-              break;
-        }
-    }
-  
-    char *str = WXSTRINGCAST formats;
-    
-    gtk_widget_dnd_drop_set( widget, TRUE, &str, valid, FALSE );
-  
-    gtk_signal_connect( GTK_OBJECT(widget), "drop_data_available_event",
-      GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this );
-      
-    gtk_signal_connect( GTK_OBJECT(widget), "drop_enter_event",
-      GTK_SIGNAL_FUNC(gtk_target_enter_callback), (gpointer) this );
-      
-    gtk_signal_connect( GTK_OBJECT(widget), "drop_leave_event",
-      GTK_SIGNAL_FUNC(gtk_target_leave_callback), (gpointer) this );
-}
-
-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
-
-wxTextDropTarget::wxTextDropTarget()
-{
-    m_format = new wxDataFormat( wxDF_TEXT );
-}
-
-bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
-{
-    OnDropText( x, y, (const char*)data );
-    return TRUE;
-}
-
-bool wxTextDropTarget::OnDropText( long x, long y, const char *psz )
-{
-/*
-    printf( "Got dropped text: %s.\n", psz );
-    printf( "At x: %d, y: %d.\n", (int)x, (int)y );
-*/
-    return TRUE;
-}
-
-size_t wxTextDropTarget::GetFormatCount() const
-{
-    return 1;
-}
-
-// ----------------------------------------------------------------------------
-// wxPrivateDropTarget
-// ----------------------------------------------------------------------------
-
-wxPrivateDropTarget::wxPrivateDropTarget()
-{
-    m_id = wxTheApp->GetAppName();
-    m_format = new wxDataFormat( m_id );
-}
-
-void wxPrivateDropTarget::SetId( const wxString& id )
-{
-    m_id = id;
-    m_format->SetId( id );
-}
+//----------------------------------------------------------------------------
+// "drag_begin"
+//----------------------------------------------------------------------------

 
 

-size_t wxPrivateDropTarget::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"
+//----------------------------------------------------------------------------

 
 

-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
-
-wxFileDropTarget::wxFileDropTarget()
-{
-    m_format = new wxDataFormat( wxDF_FILENAME );
-}    
-
-bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] )
+static void source_drag_end( GtkWidget          *WXUNUSED(widget),
+                            GdkDragContext     *WXUNUSED(context),
+                            wxDropSource       *drop_source )

 {
 {

-    printf( "Got %d dropped files.\n", (int)nFiles );
-    printf( "At x: %d, y: %d.\n", (int)x, (int)y );
+//    printf( "drag_end.\n" );

 
 

-    for (size_t i = 0; i < nFiles; i++)
-    {
-        printf( aszFiles[i] );
-        printf( "\n" );
-    }
-    
-    return TRUE;
+    drop_source->m_waiting = FALSE;

 }
 }

-
-bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
-{
-    size_t number = 0;
-    size_t i;
-    char *text = (char*) data;
-    for ( i = 0; i < size; i++)
-        if (text[i] == 0) number++;
-
-    if (number == 0) return TRUE;    
-    
-    char **files = new char*[number];
-  
-    text = (char*) data;
-    for (i = 0; i < number; i++)
-    {
-        files[i] = text;
-        int len = strlen( text );
-        text += len+1;
-    }
-
-    bool ret = OnDropFiles( x, y, 1, files ); 
-  
-    free( files );

   
   

-    return ret;
-}
-
-size_t wxFileDropTarget::GetFormatCount() const
-{
-    return 1;
-}
-
-//-------------------------------------------------------------------------
+//---------------------------------------------------------------------------

 // wxDropSource
 // wxDropSource

-//-------------------------------------------------------------------------
-
-static void
-shape_motion (GtkWidget      *widget, 
-             GdkEventMotion * /*event*/);
-             
-//-----------------------------------------------------------------------------
-// "drag_request_event"
-//-----------------------------------------------------------------------------
-
-void gtk_drag_callback( GtkWidget *widget, GdkEventDragRequest *event, wxDropSource *source )
-{
-    wxDataBroker *data = source->m_data;
-    
-    if (!data) return;
-    
-    wxNode *node = data->m_dataObjects.First();
-    {
-        wxDataObject *dobj = (wxDataObject*) node->Data();
-       
-       if ((strcmp(event->data_type,"file:ALL") == 0) &&
-           (dobj->GetFormat().GetType() == wxDF_FILENAME))
-       {
-           wxFileDataObject *file_object = (wxFileDataObject*) dobj;
-           
-           wxString text = file_object->GetFiles();
-           
-           char *s = WXSTRINGCAST text;
-           
-            gtk_widget_dnd_data_set( widget, 
-                                    (GdkEvent*)event, 
-                                    (unsigned char*) s, 
-                                    (int) text.Length()+1 );
-       
-            source->m_retValue = wxDragCopy;
-           
-           return;
-       }
-       
-       if ((strcmp(event->data_type,"text/plain") == 0) &&
-           (dobj->GetFormat().GetType() == wxDF_TEXT))
-       {
-           wxTextDataObject *text_object = (wxTextDataObject*) dobj;
-           
-           wxString text = text_object->GetText();
-           
-           char *s = WXSTRINGCAST text;
-           
-            gtk_widget_dnd_data_set( widget, 
-                                    (GdkEvent*)event, 
-                                    (unsigned char*) s, 
-                                    (int) text.Length()+1 );
-       
-            source->m_retValue = wxDragCopy;
-           
-           return;
-       }
-       
-       if (dobj->GetFormat().GetType() == wxDF_PRIVATE)
-       {
-            wxPrivateDataObject *pdo = (wxPrivateDataObject*) dobj;
-           
-           if (pdo->GetId() == event->data_type)
-           {
-                gtk_widget_dnd_data_set( widget, 
-                                    (GdkEvent*)event,
-                                    (unsigned char*) pdo->GetData(), 
-                                    (int) pdo->GetSize() );
-                                    
-                source->m_retValue = wxDragCopy;
-           
-               return;
-           }
-       }
-       
-       node = node->Next();
-   }
-}
+//---------------------------------------------------------------------------

 
 wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
 {
     g_blockEventsOnDrag = TRUE;
 
 wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
 {
     g_blockEventsOnDrag = TRUE;

+    m_waiting = TRUE;

   
     m_window = win;
     m_widget = win->m_widget;
   
     m_window = win;
     m_widget = win->m_widget;


@@ -930,7 +696,7 @@ wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop
 
 wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
 {
 
 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;
   
     m_window = win;
     m_widget = win->m_widget;


@@ -958,8 +724,6 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go,
 
 wxDropSource::wxDropSource( wxDataBroker *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_window = win;
     m_widget = win->m_widget;
     if (win->m_wxwindow) m_widget = win->m_wxwindow;


@@ -1002,277 +766,99 @@ wxDropSource::~wxDropSource(void)
    
 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" );
+    wxASSERT_MSG( m_data, _T("wxDragSource: no data") );

   
     if (!m_data) return (wxDragResult) wxDragNone;
   
   
     if (!m_data) return (wxDragResult) wxDragNone;
   

-    static GtkWidget *drag_icon = (GtkWidget*) NULL;
-    static GtkWidget *drop_icon = (GtkWidget*) NULL;
-
-    GdkPoint hotspot_1 = {0,-5 };
-      
-    if (!drag_icon)
-    {
-         drag_icon = shape_create_icon ( m_stopIcon,
-                                        440, 140, 0,0, GTK_WINDOW_POPUP);
-         
-         gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy",
-                             GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                             &drag_icon);
-
-         gtk_widget_hide (drag_icon);
-    }
-      
-    GdkPoint hotspot_2 = {-5,-5};
-       
-    if (!drop_icon)
-    {
-         drop_icon = shape_create_icon ( m_goIcon,
-                                        440, 140, 0,0, GTK_WINDOW_POPUP);
-         
-         gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy",
-                             GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                             &drop_icon);
-
-         gtk_widget_hide (drop_icon);
-    }
-       
-
-    gdk_dnd_set_drag_shape( drag_icon->window,
-                            &hotspot_1,
-                            drop_icon->window,
-                            &hotspot_2);
-  
-  
-    GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window;
+    g_blockEventsOnDrag = TRUE;

   
     RegisterWindow();
   
     RegisterWindow();

-  
-    gdk_dnd.drag_perhaps = TRUE;
+    
+    m_waiting = 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;
-  
+    GdkAtom atom = gdk_atom_intern( "STRING", FALSE );
+//    wxPrintf( _T("atom id: %d.\n"), (int)atom );
+
+    GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
+    gtk_target_list_add( target_list, atom, 0, 0 );
+    
+    GdkEventMotion event;
+    event.window = m_widget->window;

     int x = 0;
     int y = 0;
     int x = 0;
     int y = 0;

-    wxGetMousePosition( &x, &y );  
-  
-    gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE );
+    GdkModifierType state;
+    gdk_window_get_pointer( event.window, &x, &y, &state );
+    event.x = x;
+    event.y = y;
+    event.state = state;
+    event.time = GDK_CURRENT_TIME;

     
     

-    gs_currentDropSource = this;
+    /* 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 );

     
     

-    while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield();
+        while (m_waiting) gtk_main_iteration();;
+    }
+
+    g_blockEventsOnDrag = FALSE;

     
     

-    gs_currentDropSource = (wxDropSource*) NULL;
-  

     UnregisterWindow();
     UnregisterWindow();

-  
-    g_blockEventsOnDrag = FALSE;
-  
+

     return m_retValue;
 }
 
     return m_retValue;
 }
 

-void wxDropSource::RegisterWindow(void)
+void wxDropSource::RegisterWindow()

 {
 {

-    if (!m_data) return;
-
-    wxString formats;
-    
-    wxNode *node = m_data->m_dataObjects.First();
-    while (node)
-    {
-        wxDataObject* dobj = (wxDataObject*) node->Data();
+    if (!m_widget) return;

     
     

-        switch (dobj->GetFormat().GetType()) 
-        {
-            case wxDF_TEXT:
-           { 
-                  formats += "text/plain";
-                 break;
-           }
-            case wxDF_FILENAME:
-           {
-                  formats += "file:ALL";
-                 break;
-           }
-            case wxDF_PRIVATE:
-           {
-                 wxPrivateDataObject* pdo = (wxPrivateDataObject*) m_data;
-                 formats += pdo->GetId();
-                 break;
-           }
-            default:
-              break;
-       }
-       node = node->Next();
-    }
-  
-    char *str = WXSTRINGCAST formats;
-  
-    gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 );
+    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 );

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event",
-      GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this );

 }
 
 }
 

-void wxDropSource::UnregisterWindow(void)
+void wxDropSource::UnregisterWindow()

 {
     if (!m_widget) return;
 {
     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 );
-}
-
-
-/*
- * Shaped Windows
- */
-static GdkWindow *root_win = (GdkWindow*) NULL;
-
-typedef struct _cursoroffset {gint x,y;} CursorOffset;
-
-static void
-shape_pressed (GtkWidget *widget, GdkEventButton *event)
-{
-  CursorOffset *p;
-
-  /* ignore double and triple click */
-  if (event->type != GDK_BUTTON_PRESS)
-    return;
-
-  p = (CursorOffset *)gtk_object_get_user_data (GTK_OBJECT(widget));
-  p->x = (int) event->x;
-  p->y = (int) event->y;
-
-  gtk_grab_add (widget);
-  gdk_pointer_grab (widget->window, TRUE,
-                   (GdkEventMask)
-                     (GDK_BUTTON_RELEASE_MASK |
-                      GDK_BUTTON_MOTION_MASK |
-                      GDK_POINTER_MOTION_HINT_MASK),
-                   (GdkWindow*)NULL, 
-                   (GdkCursor*) NULL, 0);
-}
-
-
-static void
-shape_released (GtkWidget *widget)
-{
-  gtk_grab_remove (widget);
-  gdk_pointer_ungrab (0);
-}
-
-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);
-  
-  if (gs_currentDropSource) gs_currentDropSource->GiveFeedback( wxDragCopy, FALSE );
-}
-
-GtkWidget *
-shape_create_icon (const wxIcon &shape,
-                  gint      x,
-                  gint      y,
-                  gint      px,
-                  gint      py,
-                  gint      window_type)
-{
-  /*
-   * GDK_WINDOW_TOPLEVEL works also, giving you a title border
-   */
-  GtkWidget *window = gtk_window_new ((GtkWindowType)window_type);
-  
-  GtkWidget *fixed = gtk_fixed_new ();
-  gtk_widget_set_usize (fixed, 100,100);
-  gtk_container_add (GTK_CONTAINER (window), fixed);
-  gtk_widget_show (fixed);
-  
-  gtk_widget_set_events (window, 
-                        gtk_widget_get_events (window) |
-                        GDK_BUTTON_MOTION_MASK |
-                        GDK_POINTER_MOTION_HINT_MASK |
-                        GDK_BUTTON_PRESS_MASK);
-
-  gtk_widget_realize (window);
-  
-  GdkBitmap *mask = (GdkBitmap*) NULL;
-  if (shape.GetMask()) mask = shape.GetMask()->GetBitmap();
-
-  GtkWidget *pixmap = gtk_pixmap_new (shape.GetPixmap(), mask);
-  gtk_fixed_put (GTK_FIXED (fixed), pixmap, px,py);
-  gtk_widget_show (pixmap);
-  
-  gtk_widget_shape_combine_mask (window, mask, px,py);
-
-
-  gtk_signal_connect (GTK_OBJECT (window), "button_press_event",
-                     GTK_SIGNAL_FUNC (shape_pressed),NULL);
-  gtk_signal_connect (GTK_OBJECT (window), "button_release_event",
-                     GTK_SIGNAL_FUNC (shape_released),NULL);
-  gtk_signal_connect (GTK_OBJECT (window), "motion_notify_event",
-                     GTK_SIGNAL_FUNC (shape_motion),NULL);
-
-  CursorOffset*icon_pos = g_new (CursorOffset, 1);
-  gtk_object_set_user_data(GTK_OBJECT(window), icon_pos);
-
-  gtk_widget_set_uposition (window, x, y);
-  gtk_widget_show (window);
-  
-  return window;
+    
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+                     GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this );
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+                     GTK_SIGNAL_FUNC(source_drag_data_delete), (gpointer) this );
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+                     GTK_SIGNAL_FUNC(source_drag_begin), (gpointer) this );
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+                     GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this );

 }
 
 }
 

-#endif 
-       // NEW_GTK_DND_CODE
-       

 #endif
 
 #endif
 

-      // wxUSE_DRAG_AND_DROP
\ No newline at end of file
+      // wxUSE_DRAG_AND_DROP