X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b527aac54a829ba2ad77d8fb8609cd54eb8ef5d7..c9ed413ab4f5673ffff00198dc6ce1397398bda4:/src/gtk/dnd.cpp diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 8df9096096..08adfeb885 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -1,961 +1,896 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp +// Name: src/gtk/dnd.cpp // Purpose: wxDropTarget class // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dnd.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" -#include "wx/window.h" -#include "wx/app.h" -#include "wx/gdicmn.h" -#include "wx/intl.h" -#include "wx/utils.h" -#include "gdk/gdkprivate.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/window.h" + #include "wx/gdicmn.h" +#endif + +#include "wx/scopeguard.h" -#include +#include + +//---------------------------------------------------------------------------- +// global data +//---------------------------------------------------------------------------- + +extern bool g_blockEventsOnDrag; + +// the flags used for the last DoDragDrop() +static long gs_flagsForDrag = 0; + +// the trace mask we use with wxLogTrace() - call +// wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here +// (there are quite a few of them, so don't enable this by default) +#define TRACE_DND "dnd" + +// global variables because GTK+ DnD want to have the +// mouse event that caused it +extern GdkEvent *g_lastMouseEvent; +extern int g_lastButtonNumber; + +//---------------------------------------------------------------------------- +// standard icons +//---------------------------------------------------------------------------- + +/* Copyright (c) Julian Smart */ +static const char * page_xpm[] = { +/* columns rows colors chars-per-pixel */ +"32 32 37 1", +"5 c #7198D9", +", c #769CDA", +"2 c #DCE6F6", +"i c #FFFFFF", +"e c #779DDB", +": c #9AB6E4", +"9 c #EAF0FA", +"- c #B1C7EB", +"$ c #6992D7", +"y c #F7F9FD", +"= c #BED0EE", +"q c #F0F5FC", +"; c #A8C0E8", +"@ c #366BC2", +" c None", +"u c #FDFEFF", +"8 c #5987D3", +"* c #C4D5F0", +"7 c #7CA0DC", +"O c #487BCE", +"< c #6B94D7", +"& c #CCDAF2", +"> c #89A9DF", +"3 c #5584D1", +"w c #82A5DE", +"1 c #3F74CB", +"+ c #3A70CA", +". c #3569BF", +"% c #D2DFF4", +"# c #3366BB", +"r c #F5F8FD", +"0 c #FAFCFE", +"4 c #DFE8F7", +"X c #5E8AD4", +"o c #5282D0", +"t c #B8CCEC", +"6 c #E5EDF9", +/* pixels */ +" ", +" ", +" ", +" ", +" ", +" .XXXooOO++@# ", +" $%&*=-;::>,<1 ", +" $2%&*=-;::><:3 ", +" $42%&*=-;::<&:3 ", +" 56477<<<<8<<9&:X ", +" 59642%&*=-;<09&:5 ", +" 5q9642%&*=-<<<<<# ", +" 5qqw777<<<<<88:>+ ", +" erqq9642%&*=t;::+ ", +" eyrqq9642%&*=t;:O ", +" eyywwww777<<<GTKSetDragContext( context ); + + /* we don't need return values. this event is just for + information */ + drop_target->OnLeave(); + + /* this has to be done because GDK has no "drag_enter" event */ + drop_target->m_firstMotion = true; + + /* after this, invalidate the drop_target's GdkDragContext */ + drop_target->GTKSetDragContext( NULL ); +} } // ---------------------------------------------------------------------------- // "drag_motion" // ---------------------------------------------------------------------------- +extern "C" { static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - gint WXUNUSED(x), - gint WXUNUSED(y), - guint time ) -{ - printf( "motion.\n" ); - gdk_drag_status( context, context->suggested_action, time ); - return TRUE; -} + GdkDragContext *context, + gint x, + gint y, + guint time, + wxDropTarget *drop_target ) +{ + /* Owen Taylor: "if the coordinates not in a drop zone, + return FALSE, otherwise call gtk_drag_status() and + return TRUE" */ + +#if 0 + wxPrintf( "motion\n" ); + GList *tmp_list; + for (tmp_list = context->targets; tmp_list; tmp_list = tmp_list->next) + { + wxString atom = wxString::FromAscii( gdk_atom_name (GDK_POINTER_TO_ATOM (tmp_list->data)) ); + wxPrintf( "Atom: %s\n", atom ); + } +#endif -// ---------------------------------------------------------------------------- -// "drag_drop" -// ---------------------------------------------------------------------------- + // Inform the wxDropTarget about the current GdkDragContext. + // This is only valid for the duration of this call. + drop_target->GTKSetDragContext( context ); -static gboolean target_drag_drop( GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - guint time ) -{ - printf( "drop at: %d,%d.\n", x, y ); - - if (context->targets) + // Does the source actually accept the data type? + if (drop_target->GTKGetMatchingPair() == (GdkAtom) 0) { - gtk_drag_get_data( widget, - context, - GPOINTER_TO_INT (context->targets->data), - time ); + drop_target->GTKSetDragContext( NULL ); + return FALSE; } - return FALSE; -} -// ---------------------------------------------------------------------------- -// "drag_data_received" -// ---------------------------------------------------------------------------- + wxDragResult suggested_action = drop_target->GTKFigureOutSuggestedAction(); -static void target_drag_data_received( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *data, - guint WXUNUSED(info), - guint time ) -{ - printf( "data receive at: %d,%d.\n", x, y ); - - if ((data->length >= 0) && (data->format == 8)) + wxDragResult result = wxDragNone; + + if (drop_target->m_firstMotion) { - wxString str = (const char*)data->data; - printf( "Received %s\n.", WXSTRINGCAST str ); - gtk_drag_finish( context, TRUE, FALSE, time ); - return; + // the first "drag_motion" event substitutes a "drag_enter" event + result = drop_target->OnEnter( x, y, suggested_action ); } - - gtk_drag_finish (context, FALSE, FALSE, time); + else + { + // give program a chance to react (i.e. to say no by returning FALSE) + result = drop_target->OnDragOver( x, y, suggested_action ); + } + + GdkDragAction result_action = GDK_ACTION_DEFAULT; + if (result == wxDragCopy) + result_action = GDK_ACTION_COPY; + else if (result == wxDragLink) + result_action = GDK_ACTION_LINK; + else + result_action = GDK_ACTION_MOVE; + + // is result action actually supported + bool ret ((result_action != GDK_ACTION_DEFAULT) && + (context->actions & result_action)); + + if (ret) + gdk_drag_status( context, result_action, time ); + + // after this, invalidate the drop_target's GdkDragContext + drop_target->GTKSetDragContext( NULL ); + + // this has to be done because GDK has no "drag_enter" event + drop_target->m_firstMotion = false; + + return ret; +} } // ---------------------------------------------------------------------------- -// wxDropTarget +// "drag_drop" // ---------------------------------------------------------------------------- -wxDropTarget::wxDropTarget() -{ -} +extern "C" { +static gboolean target_drag_drop( GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + wxDropTarget *drop_target ) +{ + /* 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()" */ + + /* inform the wxDropTarget about the current GdkDragContext. + this is only valid for the duration of this call */ + drop_target->GTKSetDragContext( context ); + + // Does the source actually accept the data type? + if (drop_target->GTKGetMatchingPair() == (GdkAtom) 0) + { + // cancel the whole thing + gtk_drag_finish( context, + FALSE, // no success + FALSE, // don't delete data on dropping side + time ); -wxDropTarget::~wxDropTarget() -{ -} + drop_target->GTKSetDragContext( 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_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); + drop_target->m_firstMotion = true; - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); + return FALSE; + } - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); + /* inform the wxDropTarget about the current drag widget. + this is only valid for the duration of this call */ + drop_target->GTKSetDragWidget( widget ); - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); -} + /* inform the wxDropTarget about the current drag time. + this is only valid for the duration of this call */ + drop_target->GTKSetDragTime( time ); -void wxDropTarget::RegisterWidget( GtkWidget *widget ) -{ - wxCHECK_RET( widget != NULL, "register widget is NULL" ); - - GtkTargetEntry format; - format.info = 0; - format.flags = 0; - - int valid = 0; - for ( size_t i = 0; i < GetFormatCount(); i++ ) - { - wxDataFormat df = GetFormat( i ); - switch (df) + /* reset the block here as someone might very well + show a dialog as a reaction to a drop and this + wouldn't work without events */ + g_blockEventsOnDrag = false; + + bool ret = drop_target->OnDrop( x, y ); + + if (!ret) { - case wxDF_TEXT: - format.target = "text/plain"; - valid++; - break; - case wxDF_FILENAME: - format.target = "file:ALL"; - valid++; - break; - default: - break; + wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") ); + + /* cancel the whole thing */ + gtk_drag_finish( context, + FALSE, /* no success */ + FALSE, /* don't delete data on dropping side */ + time ); } - } - - wxASSERT_MSG( valid != 0, "No valid DnD format supported." ); - - gtk_drag_dest_set( widget, - GTK_DEST_DEFAULT_ALL, - &format, - 1, - (GdkDragAction)(GDK_ACTION_COPY | GDK_ACTION_MOVE) ); - - gtk_signal_connect( GTK_OBJECT(widget), "drag_leave", - GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); + else + { + wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") ); - gtk_signal_connect( GTK_OBJECT(widget), "drag_motion", - GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); + GdkAtom format = drop_target->GTKGetMatchingPair(); - gtk_signal_connect( GTK_OBJECT(widget), "drag_drop", - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); + // this does happen somehow, see bug 555111 + wxCHECK_MSG( format, FALSE, wxT("no matching GdkAtom for format?") ); - gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received", - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); -} + /* this should trigger an "drag_data_received" event */ + gtk_drag_get_data( widget, + context, + format, + time ); + } -// ---------------------------------------------------------------------------- -// wxTextDropTarget -// ---------------------------------------------------------------------------- + /* after this, invalidate the drop_target's GdkDragContext */ + drop_target->GTKSetDragContext( NULL ); -bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) -{ - OnDropText( x, y, (const char*)data ); - return TRUE; -} + /* after this, invalidate the drop_target's drag widget */ + drop_target->GTKSetDragWidget( NULL ); -bool wxTextDropTarget::OnDropText( long x, long y, const char *psz ) -{ - printf( "Got dropped text: %s.\n", psz ); - printf( "At x: %d, y: %d.\n", (int)x, (int)y ); - return TRUE; -} + /* this has to be done because GDK has no "drag_enter" event */ + drop_target->m_firstMotion = true; -size_t wxTextDropTarget::GetFormatCount() const -{ - return 1; + return ret; } - -wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const -{ - return wxDF_TEXT; } // ---------------------------------------------------------------------------- -// wxFileDropTarget +// "drag_data_received" // ---------------------------------------------------------------------------- -bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] ) -{ - printf( "Got %d dropped files.\n", (int)nFiles ); - printf( "At x: %d, y: %d.\n", (int)x, (int)y ); - for (size_t i = 0; i < nFiles; i++) - { - printf( aszFiles[i] ); - printf( "\n" ); - } - return TRUE; -} +extern "C" { +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 ) +{ + /* Owen Taylor: "call gtk_drag_finish() with + success == TRUE" */ + + 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); -bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) -{ - size_t number = 0; - char *text = (char*) data; - for (size_t i = 0; i < size; i++) - if (text[i] == 0) number++; - - if (number == 0) return TRUE; - - char **files = new char*[number]; - - text = (char*) data; - for (size_t i = 0; i < number; i++) - { - 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; -} + return; + } -wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const -{ - return wxDF_FILENAME; -} + wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") ); -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- + /* inform the wxDropTarget about the current GtkSelectionData. + this is only valid for the duration of this call */ + drop_target->GTKSetDragData( data ); -wxDropSource::wxDropSource( wxWindow *win ) -{ - g_blockEventsOnDrag = TRUE; - - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; - - m_data = (wxDataObject *) NULL; - m_retValue = wxDragCancel; + wxDragResult result = ConvertFromGTK(context->action); - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); -} + if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) ) + { + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") ); -wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win ) -{ - g_blockEventsOnDrag = TRUE; - - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; - m_retValue = wxDragCancel; - - m_data = &data; + /* tell GTK that data transfer was successful */ + gtk_drag_finish( context, TRUE, FALSE, time ); + } + else + { + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") ); + + /* tell GTK that data transfer was not successful */ + gtk_drag_finish( context, FALSE, FALSE, time ); + } - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); + /* after this, invalidate the drop_target's drag data */ + drop_target->GTKSetDragData( NULL ); +} } -void wxDropSource::SetData( wxDataObject &data ) +//---------------------------------------------------------------------------- +// wxDropTarget +//---------------------------------------------------------------------------- + +wxDropTarget::wxDropTarget( wxDataObject *data ) + : wxDropTargetBase( data ) { - m_data = &data; + m_firstMotion = true; + m_dragContext = NULL; + m_dragWidget = NULL; + m_dragData = NULL; + m_dragTime = 0; } -wxDropSource::~wxDropSource(void) +wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), + wxCoord WXUNUSED(y), + wxDragResult def ) { -// if (m_data) delete m_data; - - g_blockEventsOnDrag = FALSE; + return def; } - -wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) -{ - wxASSERT_MSG( m_data, "wxDragSource: no data" ); - - if (!m_data) return (wxDragResult) wxDragNone; - if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone; - - RegisterWindow(); - - // TODO - - UnregisterWindow(); - - g_blockEventsOnDrag = FALSE; - - return m_retValue; -} - -void wxDropSource::RegisterWindow(void) -{ - if (!m_data) return; - wxString formats; - - wxDataFormat df = m_data->GetPreferredFormat(); - - switch (df) - { - case wxDF_TEXT: - formats += "text/plain"; - break; - case wxDF_FILENAME: - formats += "file:ALL"; - break; - default: - break; - } - - char *str = WXSTRINGCAST formats; - - // TODO +bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) +{ + return true; } -void wxDropSource::UnregisterWindow(void) +wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), + wxDragResult def ) { - if (!m_widget) return; - - // TODO -} - - -#else // NEW_CODE - -GtkWidget *shape_create_icon (char **data, - gint x, - gint y, - gint px, - gint py, - gint window_type); - -/* XPM */ -static char * gv_xpm[] = { -"40 34 3 1", -" s None c None", -". c black", -"X c white", -" ", -" ", -" ...... ", -" ..XXXXXX.. ", -" .XXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXX. ", -" .XXX..XXXX..XXX. ", -" ....XX....XX....XX. ", -" .XXX.XXX..XXXX..XXX.... ", -" .XXXXXXXXXXXXXXXXXXX.XXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXX. ", -" ..XXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXX... ", -" ..XXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXX.XXXXXXX. ", -" .XXXXXXX.XXXXXXX.XXXXXXX. ", -" .XXXXXXXX.XXXXXXX.XXXXXXX. ", -" .XXXXXXX...XXXXX...XXXXX. ", -" .XXXXXXX. ..... ..... ", -" ..XXXX.. ", -" .... ", -" ", -" ", -" "}; - -/* XPM */ -static char * page_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 5 1", -/* colors */ -" s None c None", -". c black", -"X c wheat", -"o c tan", -"O c #6699FF", -/* pixels */ -" ................... ", -" .XXXXXXXXXXXXXXXXX.. ", -" .XXXXXXXXXXXXXXXXX.o. ", -" .XXXXXXXXXXXXXXXXX.oo. ", -" .XXXXXXXXXXXXXXXXX.ooo. ", -" .XXXXXXXXXXXXXXXXX.oooo. ", -" .XXXXXXXXXXXXXXXXX....... ", -" .XXXXXOOOOOOOOOOXXXooooo. ", -" .XXXXXXXXXXXXXXXXXXooooo. ", -" .XXXXXOOOOOOOOOOXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXOOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXOOOOOOOOOOXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXOOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXOOOOOOOOOOXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXOOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXOOOOOOOXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" ......................... "}; - - -//----------------------------------------------------------------------------- -// "drop_data_available_event" -//----------------------------------------------------------------------------- + return GetData() ? def : wxDragNone; +} -static void gtk_target_callback( GtkWidget *widget, - GdkEventDropDataAvailable *event, - wxDropTarget *target ) +wxDragResult wxDropTarget::GTKFigureOutSuggestedAction() { - if (target) - { - int x = 0; - int y = 0; - gdk_window_get_pointer( widget->window, &x, &y, (GdkModifierType *) NULL ); + if (!m_dragContext) + return wxDragError; -// printf( "Drop data is of type %s.\n", event->data_type ); - - target->OnDrop( x, y, (const void*)event->data, (size_t)event->data_numbytes ); + // GTK+ always supposes that we want to copy the data by default while we + // might want to move it, so examine not only suggested_action - which is + // only good if we don't have our own preferences - but also the actions + // field + wxDragResult suggested_action = wxDragNone; + if (GetDefaultAction() == wxDragNone) + { + // use default action set by wxDropSource::DoDragDrop() + if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove && + (m_dragContext->actions & GDK_ACTION_MOVE ) ) + { + // move is requested by the program and allowed by GTK+ - do it, even + // though suggested_action may be currently wxDragCopy + suggested_action = wxDragMove; + } + else // use whatever GTK+ says we should + { + suggested_action = ConvertFromGTK(m_dragContext->suggested_action); + +#if 0 + // RR: I don't understand the code below: if the drag comes from + // a different app, the gs_flagsForDrag is invalid; if it + // comes from the same wx app, then GTK+ hopefully won't + // suggest something we didn't allow in the frist place + // in DoDrop() + if ( (suggested_action == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) ) + { + // we're requested to move but we can't + suggested_action = wxDragCopy; + } +#endif + } } + else if (GetDefaultAction() == wxDragMove && + (m_dragContext->actions & GDK_ACTION_MOVE)) + { -/* - g_free (event->data); - g_free (event->data_type); -*/ -} - -// ---------------------------------------------------------------------------- -// wxDropTarget -// ---------------------------------------------------------------------------- + suggested_action = wxDragMove; + } + else + { + if (m_dragContext->actions & GDK_ACTION_COPY) + suggested_action = wxDragCopy; + else if (m_dragContext->actions & GDK_ACTION_MOVE) + suggested_action = wxDragMove; + else if (m_dragContext->actions & GDK_ACTION_LINK) + suggested_action = wxDragLink; + else + suggested_action = wxDragNone; + } -wxDropTarget::wxDropTarget() -{ + return suggested_action; } -wxDropTarget::~wxDropTarget() +wxDataFormat wxDropTarget::GetMatchingPair() { + return wxDataFormat( GTKGetMatchingPair() ); } -void wxDropTarget::UnregisterWidget( GtkWidget *widget ) +GdkAtom wxDropTarget::GTKGetMatchingPair(bool quiet) { - if (!widget) return; - - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this ); + if (!m_dataObject) + return (GdkAtom) 0; - gtk_widget_dnd_drop_set( widget, FALSE, (gchar **) NULL, 0, FALSE ); -} + if (!m_dragContext) + return (GdkAtom) 0; -void wxDropTarget::RegisterWidget( GtkWidget *widget ) -{ - wxString formats; - int valid = 0; - - for ( size_t i = 0; i < GetFormatCount(); i++ ) + GList *child = m_dragContext->targets; + while (child) { - wxDataFormat df = GetFormat( i ); - switch (df) + GdkAtom formatAtom = (GdkAtom)(child->data); + wxDataFormat format( formatAtom ); + + if ( !quiet ) { - 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; + wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"), + format.GetId().c_str()); } - } - - 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 ); -} -// ---------------------------------------------------------------------------- -// wxTextDropTarget -// ---------------------------------------------------------------------------- + if (m_dataObject->IsSupportedFormat( format )) + return formatAtom; -bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) -{ - OnDropText( x, y, (const char*)data ); - return TRUE; + child = child->next; + } + + return (GdkAtom) 0; } -bool wxTextDropTarget::OnDropText( long x, long y, const char *psz ) +bool wxDropTarget::GetData() { - printf( "Got dropped text: %s.\n", psz ); - printf( "At x: %d, y: %d.\n", (int)x, (int)y ); - return TRUE; + if (!m_dragData) + return false; + + if (!m_dataObject) + return false; + + wxDataFormat dragFormat( m_dragData->target ); + + if (!m_dataObject->IsSupportedFormat( dragFormat )) + return false; + + m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data ); + + return true; } -size_t wxTextDropTarget::GetFormatCount() const +void wxDropTarget::GtkUnregisterWidget( GtkWidget *widget ) { - return 1; + wxCHECK_RET( widget != NULL, wxT("unregister widget is NULL") ); + + gtk_drag_dest_unset( widget ); + + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_leave, this); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_motion, this); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_drop, this); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_data_received, this); } -wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const +void wxDropTarget::GtkRegisterWidget( GtkWidget *widget ) { - return wxDF_TEXT; + wxCHECK_RET( widget != NULL, wxT("register widget is NULL") ); + + /* gtk_drag_dest_set() determines what default behaviour we'd like + GTK to supply. we don't want to specify out targets (=formats) + or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and + not GTK_DEST_DEFAULT_DROP). instead we react individually to + "drag_motion" and "drag_drop" events. this makes it possible + to allow dropping on only a small area. we should set + GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice + highlighting if dragging over standard controls, but this + seems to be broken without the other two. */ + + gtk_drag_dest_set( widget, + (GtkDestDefaults) 0, /* no default behaviour */ + NULL, /* we don't supply any formats here */ + 0, /* number of targets = 0 */ + (GdkDragAction) 0 ); /* we don't supply any actions here */ + + g_signal_connect (widget, "drag_leave", + G_CALLBACK (target_drag_leave), this); + + g_signal_connect (widget, "drag_motion", + G_CALLBACK (target_drag_motion), this); + + g_signal_connect (widget, "drag_drop", + G_CALLBACK (target_drag_drop), this); + + g_signal_connect (widget, "drag_data_received", + G_CALLBACK (target_drag_data_received), this); } -// ---------------------------------------------------------------------------- -// wxFileDropTarget -// ---------------------------------------------------------------------------- +//---------------------------------------------------------------------------- +// "drag_data_get" +//---------------------------------------------------------------------------- -bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] ) +extern "C" { +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++) + wxDataFormat format( selection_data->target ); + + wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"), + format.GetId().c_str()); + + drop_source->m_retValue = wxDragError; + + wxDataObject *data = drop_source->GetDataObject(); + + if (!data) { - printf( aszFiles[i] ); - printf( "\n" ); + wxLogTrace(TRACE_DND, wxT("Drop source: no data object") ); + return; } - return TRUE; -} -bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) -{ - size_t number = 0; - char *text = (char*) data; - for (size_t i = 0; i < size; i++) - if (text[i] == 0) number++; - - if (number == 0) return TRUE; - - char **files = new char*[number]; - - text = (char*) data; - for (size_t i = 0; i < number; i++) + if (!data->IsSupportedFormat(format)) { - files[i] = text; - int len = strlen( text ); - text += len+1; + wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") ); + return; } - bool ret = OnDropFiles( x, y, 1, files ); - - free( files ); - - return ret; + if (data->GetDataSize(format) == 0) + { + wxLogTrace(TRACE_DND, wxT("Drop source: empty data") ); + return; + } + + size_t size = data->GetDataSize(format); + +// printf( "data size: %d.\n", (int)data_size ); + + guchar *d = new guchar[size]; + + if (!data->GetDataHere( format, (void*)d )) + { + delete[] d; + return; + } + + drop_source->m_retValue = ConvertFromGTK( context->action ); + + gtk_selection_data_set( selection_data, + selection_data->target, + 8, // 8-bit + d, + size ); + + delete[] d; } +} + +//---------------------------------------------------------------------------- +// "drag_end" +//---------------------------------------------------------------------------- -size_t wxFileDropTarget::GetFormatCount() const +extern "C" { +static void source_drag_end( GtkWidget *WXUNUSED(widget), + GdkDragContext *WXUNUSED(context), + wxDropSource *drop_source ) { - return 1; + drop_source->m_waiting = false; +} } -wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const +//----------------------------------------------------------------------------- +// "configure_event" from m_iconWindow +//----------------------------------------------------------------------------- + +extern "C" { +static gint +gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source ) { - return wxDF_FILENAME; + source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) ); + + return 0; +} } -//------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // wxDropSource -//------------------------------------------------------------------------- - -static void -shape_motion (GtkWidget *widget, - GdkEventMotion */*event*/); - -//----------------------------------------------------------------------------- -// drag request +//--------------------------------------------------------------------------- -void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source ) +wxDropSource::wxDropSource(wxWindow *win, + const wxIcon &iconCopy, + const wxIcon &iconMove, + const wxIcon &iconNone) { - wxDataObject *data = source->m_data; - - size_t size = data->GetDataSize(); - char *ptr = new char[size]; - data->GetDataHere( ptr ); - - gtk_widget_dnd_data_set( widget, event, ptr, size ); - - delete ptr; - - source->m_retValue = wxDragCopy; -} - -wxDropSource::wxDropSource( wxWindow *win ) + m_waiting = true; + + m_iconWindow = NULL; + + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; + + m_retValue = wxDragNone; + + SetIcons(iconCopy, iconMove, iconNone); +} + +wxDropSource::wxDropSource(wxDataObject& data, + wxWindow *win, + const wxIcon &iconCopy, + const wxIcon &iconMove, + const wxIcon &iconNone) { - g_blockEventsOnDrag = TRUE; - - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; - - m_data = (wxDataObject *) NULL; - m_retValue = wxDragCancel; + m_waiting = true; - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); + SetData( data ); + + m_iconWindow = NULL; + + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; + + m_retValue = wxDragNone; + + SetIcons(iconCopy, iconMove, iconNone); } -wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win ) +void wxDropSource::SetIcons(const wxIcon &iconCopy, + const wxIcon &iconMove, + const wxIcon &iconNone) { - g_blockEventsOnDrag = TRUE; - - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; - m_retValue = wxDragCancel; - - m_data = &data; + m_iconCopy = iconCopy; + m_iconMove = iconMove; + m_iconNone = iconNone; - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); + if ( !m_iconCopy.Ok() ) + m_iconCopy = wxIcon(page_xpm); + if ( !m_iconMove.Ok() ) + m_iconMove = m_iconCopy; + if ( !m_iconNone.Ok() ) + m_iconNone = m_iconCopy; } -void wxDropSource::SetData( wxDataObject &data ) +wxDropSource::~wxDropSource() { - m_data = &data; } -wxDropSource::~wxDropSource(void) +void wxDropSource::PrepareIcon( int action, GdkDragContext *context ) { -// if (m_data) delete m_data; + // get the right icon to display + wxIcon *icon = NULL; + if ( action & GDK_ACTION_MOVE ) + icon = &m_iconMove; + else if ( action & GDK_ACTION_COPY ) + icon = &m_iconCopy; + else + icon = &m_iconNone; + + GdkBitmap *mask; + if ( icon->GetMask() ) + mask = icon->GetMask()->GetBitmap(); + else + mask = NULL; + + GdkPixmap *pixmap = icon->GetPixmap(); + + gint width,height; + gdk_drawable_get_size (pixmap, &width, &height); + + GdkColormap *colormap = gtk_widget_get_colormap( m_widget ); + gtk_widget_push_colormap (colormap); + + m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP); + gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); + gtk_widget_set_app_paintable (m_iconWindow, TRUE); + + gtk_widget_pop_colormap (); + + gtk_widget_set_size_request (m_iconWindow, width, height); + gtk_widget_realize (m_iconWindow); + + g_signal_connect (m_iconWindow, "configure_event", + G_CALLBACK (gtk_dnd_window_configure_callback), this); + + gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE); + + if (mask) + gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0); - g_blockEventsOnDrag = FALSE; + gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 ); } - -wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) -{ - if (gdk_dnd.dnd_grabbed) return (wxDragResult) wxDragNone; - if (gdk_dnd.drag_really) return (wxDragResult) wxDragNone; - - wxASSERT_MSG( m_data, "wxDragSource: no data" ); - - if (!m_data) return (wxDragResult) wxDragNone; - if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone; - - static GtkWidget *drag_icon = NULL; - static GtkWidget *drop_icon = NULL; - - GdkPoint hotspot_1 = {0,-5 }; - - if (!drag_icon) - { - drag_icon = shape_create_icon ( gv_xpm, - 440, 140, 0,0, GTK_WINDOW_POPUP); - - gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy", - GTK_SIGNAL_FUNC(gtk_widget_destroyed), - &drag_icon); - - gtk_widget_hide (drag_icon); - } - - GdkPoint hotspot_2 = {-5,-5}; - - if (!drop_icon) - { - drop_icon = shape_create_icon ( page_xpm, - 440, 140, 0,0, GTK_WINDOW_POPUP); - - gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy", - GTK_SIGNAL_FUNC(gtk_widget_destroyed), - &drop_icon); - - gtk_widget_hide (drop_icon); - } - - - gdk_dnd_set_drag_shape( drag_icon->window, - &hotspot_1, - drop_icon->window, - &hotspot_2); - - - GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window; - - RegisterWindow(); - - gdk_dnd.drag_perhaps = TRUE; - - gdk_dnd.dnd_drag_start.x = 5; - gdk_dnd.dnd_drag_start.y = 5; - gdk_dnd.real_sw = wp; - - if (gdk_dnd.drag_startwindows) - { - g_free( gdk_dnd.drag_startwindows ); - gdk_dnd.drag_startwindows = (GdkWindow **) NULL; - } - gdk_dnd.drag_numwindows = gdk_dnd.drag_really = 0; - - XWindowAttributes dnd_winattr; - XGetWindowAttributes( gdk_display, wp->xwindow, &dnd_winattr ); - wp->dnd_drag_savedeventmask = dnd_winattr.your_event_mask; - - gdk_dnd_drag_addwindow( m_widget->window ); - - GdkEventDragBegin ev; - ev.type = GDK_DRAG_BEGIN; - ev.window = m_widget->window; - ev.u.allflags = 0; - ev.u.flags.protocol_version = DND_PROTOCOL_VERSION; - - gdk_event_put( (GdkEvent*)&ev ); - - XGrabPointer( gdk_display, wp->xwindow, False, - ButtonMotionMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask, - GrabModeAsync, GrabModeAsync, gdk_root_window, None, CurrentTime ); - - gdk_dnd_set_drag_cursors( m_defaultCursor.GetCursor(), m_goaheadCursor.GetCursor() ); - - gdk_dnd.dnd_grabbed = TRUE; - gdk_dnd.drag_really = 1; - - int x = 0; - int y = 0; - wxGetMousePosition( &x, &y ); - - gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE ); - -/* - shape_motion( drag_icon, (GdkEventMotion *)NULL ); - shape_motion( drop_icon, (GdkEventMotion *)NULL ); -*/ - - while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield(); - - UnregisterWindow(); - - g_blockEventsOnDrag = FALSE; - - return m_retValue; -} - -void wxDropSource::RegisterWindow(void) + +wxDragResult wxDropSource::DoDragDrop(int flags) { - if (!m_data) return; + wxCHECK_MSG( m_data && m_data->GetFormatCount(), wxDragNone, + wxT("Drop source: no data") ); + + // still in drag + if (g_blockEventsOnDrag) + return wxDragNone; + + // don't start dragging if no button is down + if (g_lastButtonNumber == 0) + return wxDragNone; + + // we can only start a drag after a mouse event + if (g_lastMouseEvent == NULL) + return wxDragNone; + + GTKConnectDragSignals(); + wxON_BLOCK_EXIT_OBJ0(*this, wxDropSource::GTKDisconnectDragSignals); + + m_waiting = true; - wxString formats; - - wxDataFormat df = m_data->GetPreferredFormat(); - - switch (df) + GtkTargetList *target_list = gtk_target_list_new( NULL, 0 ); + + wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; + m_data->GetAllFormats( array ); + size_t count = m_data->GetFormatCount(); + for (size_t i = 0; i < count; i++) { - case wxDF_TEXT: - formats += "text/plain"; - break; - case wxDF_FILENAME: - formats += "file:ALL"; - break; - default: - break; + GdkAtom atom = array[i]; + wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), + gdk_atom_name( atom )); + gtk_target_list_add( target_list, atom, 0, 0 ); } - - char *str = WXSTRINGCAST formats; - - gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 ); + delete[] array; - gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event", - GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this ); -} + int allowed_actions = GDK_ACTION_COPY; + if ( flags & wxDrag_AllowMove ) + allowed_actions |= GDK_ACTION_MOVE; -void wxDropSource::UnregisterWindow(void) -{ - if (!m_widget) return; - - gtk_widget_dnd_drag_set( m_widget, FALSE, (gchar **) NULL, 0 ); - - gtk_signal_disconnect_by_data( GTK_OBJECT(m_widget), (gpointer)this ); -} + // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad + // to use a global to pass the flags to the drop target but I'd + // surely prefer a better way to do it + gs_flagsForDrag = flags; + m_retValue = wxDragCancel; -/* - * Shaped Windows - */ -static GdkWindow *root_win = NULL; + GdkDragContext *context = gtk_drag_begin( m_widget, + target_list, + (GdkDragAction)allowed_actions, + g_lastButtonNumber, // number of mouse button which started drag + (GdkEvent*) g_lastMouseEvent ); -typedef struct _cursoroffset {gint x,y;} CursorOffset; + if ( !context ) + { + // this can happen e.g. if gdk_pointer_grab() failed + return wxDragError; + } -static void -shape_pressed (GtkWidget *widget, GdkEventButton *event) -{ - CursorOffset *p; + m_dragContext = context; - /* ignore double and triple click */ - if (event->type != GDK_BUTTON_PRESS) - return; + PrepareIcon( allowed_actions, context ); - p = (CursorOffset *)gtk_object_get_user_data (GTK_OBJECT(widget)); - p->x = (int) event->x; - p->y = (int) event->y; + while (m_waiting) + gtk_main_iteration(); - gtk_grab_add (widget); - gdk_pointer_grab (widget->window, TRUE, - (GdkEventMask) - (GDK_BUTTON_RELEASE_MASK | - GDK_BUTTON_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK), - NULL, NULL, 0); -} + g_signal_handlers_disconnect_by_func (m_iconWindow, + (gpointer) gtk_dnd_window_configure_callback, this); + return m_retValue; +} -static void -shape_released (GtkWidget *widget) +void wxDropSource::GTKConnectDragSignals() { - gtk_grab_remove (widget); - gdk_pointer_ungrab (0); + if (!m_widget) + return; + + g_blockEventsOnDrag = true; + + g_signal_connect (m_widget, "drag_data_get", + G_CALLBACK (source_drag_data_get), this); + g_signal_connect (m_widget, "drag_end", + G_CALLBACK (source_drag_end), this); + } -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); -} - -GtkWidget * -shape_create_icon (char **data, - gint x, - gint y, - gint px, - gint py, - gint window_type) +void wxDropSource::GTKDisconnectDragSignals() { - GtkWidget *window; - GtkWidget *pixmap; - GtkWidget *fixed; - CursorOffset* icon_pos; - GdkGC* gc; - GdkBitmap *gdk_pixmap_mask; - GdkPixmap *gdk_pixmap; - GtkStyle *style; - - style = gtk_widget_get_default_style (); - gc = style->black_gc; - - /* - * GDK_WINDOW_TOPLEVEL works also, giving you a title border - */ - window = gtk_window_new ((GtkWindowType)window_type); - - fixed = gtk_fixed_new (); - gtk_widget_set_usize (fixed, 100,100); - gtk_container_add (GTK_CONTAINER (window), fixed); - gtk_widget_show (fixed); - - gtk_widget_set_events (window, - gtk_widget_get_events (window) | - GDK_BUTTON_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK | - GDK_BUTTON_PRESS_MASK); - - gtk_widget_realize (window); - - gdk_pixmap = gdk_pixmap_create_from_xpm_d (window->window, &gdk_pixmap_mask, - &style->bg[GTK_STATE_NORMAL], - (gchar**) data ); - - pixmap = gtk_pixmap_new (gdk_pixmap, gdk_pixmap_mask); - gtk_fixed_put (GTK_FIXED (fixed), pixmap, px,py); - gtk_widget_show (pixmap); - - gtk_widget_shape_combine_mask (window, gdk_pixmap_mask, px,py); - - - gtk_signal_connect (GTK_OBJECT (window), "button_press_event", - GTK_SIGNAL_FUNC (shape_pressed),NULL); - gtk_signal_connect (GTK_OBJECT (window), "button_release_event", - GTK_SIGNAL_FUNC (shape_released),NULL); - gtk_signal_connect (GTK_OBJECT (window), "motion_notify_event", - GTK_SIGNAL_FUNC (shape_motion),NULL); - - icon_pos = g_new (CursorOffset, 1); - gtk_object_set_user_data(GTK_OBJECT(window), icon_pos); - - gtk_widget_set_uposition (window, x, y); - gtk_widget_show (window); - - return window; -} - - - - -#endif - // NEW_GTK_DND_CODE - + if (!m_widget) + return; + + g_blockEventsOnDrag = false; + + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) source_drag_data_get, + this); + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) source_drag_end, + this); +} + +#endif + // wxUSE_DRAG_AND_DROP