X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/829e3e8d3d177f5323e1ed7eec733f33a10a0df8..a1925afc905df6260036832e58d2f3919caad03f:/src/gtk1/dnd.cpp diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index 00f4e0d90a..289765439d 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -25,7 +25,15 @@ #include "gtk/gtk.h" #include "gdk/gdkprivate.h" -#include +#include "gtk/gtkdnd.h" +#include "gtk/gtkselection.h" + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //---------------------------------------------------------------------------- // global data @@ -40,9 +48,9 @@ extern bool g_blockEventsOnDrag; /* XPM */ static char * gv_xpm[] = { "40 34 3 1", -" s None c None", -". c black", -"X c white", +" s None c None", +". c black", +"X c white", " ", " ", " ...... ", @@ -77,17 +85,17 @@ static char * gv_xpm[] = { " ", " ", " "}; - + /* 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", +" s None c None", +". c black", +"X c wheat", +"o c tan", +"O c #6699FF", /* pixels */ " ................... ", " .XXXXXXXXXXXXXXXXX.. ", @@ -121,33 +129,31 @@ static char * page_xpm[] = { " .XXXXXXXXXXXXXXXXXXXXXXX. ", " .XXXXXXXXXXXXXXXXXXXXXXX. ", " ......................... "}; - - -#if (GTK_MINOR_VERSION > 0) -#include "gtk/gtkdnd.h" -#include "gtk/gtkselection.h" + // ---------------------------------------------------------------------------- // "drag_leave" // ---------------------------------------------------------------------------- static void target_drag_leave( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - guint WXUNUSED(time), - wxDropTarget *drop_target ) + GdkDragContext *context, + guint WXUNUSED(time), + wxDropTarget *drop_target ) { + if (g_isIdle) wxapp_install_idle_handler(); + /* inform the wxDropTarget about the current GdkDragContext. this is only valid for the duration of this call */ drop_target->SetDragContext( context ); - + /* we don't need return values. this event is just for information */ drop_target->OnLeave(); - + /* this has to be done because GDK has no "drag_enter" event */ drop_target->m_firstMotion = TRUE; - + /* after this, invalidate the drop_target's GdkDragContext */ drop_target->SetDragContext( (GdkDragContext*) NULL ); } @@ -157,41 +163,43 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget), // ---------------------------------------------------------------------------- static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - gint x, - gint y, - guint time, - wxDropTarget *drop_target ) + GdkDragContext *context, + gint x, + gint y, + guint time, + wxDropTarget *drop_target ) { + if (g_isIdle) wxapp_install_idle_handler(); + /* Owen Taylor: "if the coordinates not in a drop zone, return FALSE, otherwise call gtk_drag_status() and return TRUE" */ - + /* inform the wxDropTarget about the current GdkDragContext. this is only valid for the duration of this call */ drop_target->SetDragContext( context ); - + if (drop_target->m_firstMotion) { /* the first "drag_motion" event substitutes a "drag_enter" event */ - drop_target->OnEnter(); + drop_target->OnEnter(); } - + /* give program a chance to react (i.e. to say no by returning FALSE) */ bool ret = drop_target->OnMove( x, y ); - + /* we don't yet handle which "actions" (i.e. copy or move) the target accepts. so far we simply accept the suggested action. TODO. */ if (ret) gdk_drag_status( context, context->suggested_action, time ); - + /* after this, invalidate the drop_target's GdkDragContext */ drop_target->SetDragContext( (GdkDragContext*) NULL ); - + /* this has to be done because GDK has no "drag_enter" event */ drop_target->m_firstMotion = FALSE; - + return ret; } @@ -200,61 +208,57 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), // ---------------------------------------------------------------------------- static gboolean target_drag_drop( GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - guint time, - wxDropTarget *drop_target ) + GdkDragContext *context, + gint x, + gint y, + guint time, + wxDropTarget *drop_target ) { + if (g_isIdle) wxapp_install_idle_handler(); + /* Owen Taylor: "if the drop is not in a drop zone, return FALSE, otherwise, if you aren't accepting the drop, call gtk_drag_finish() with success == FALSE otherwise call gtk_drag_data_get()" */ - + +// printf( "drop.\n" ); + /* this seems to make a difference between not accepting due to wrong target area and due to wrong format. let us hope that this is not required.. */ - + /* inform the wxDropTarget about the current GdkDragContext. this is only valid for the duration of this call */ drop_target->SetDragContext( context ); - + /* inform the wxDropTarget about the current drag widget. this is only valid for the duration of this call */ drop_target->SetDragWidget( widget ); - + /* inform the wxDropTarget about the current drag time. this is only valid for the duration of this call */ drop_target->SetDragTime( time ); - + bool ret = drop_target->OnDrop( x, y ); - - if (ret) - { - /* this should trigger an "drag_data_received" event */ - gtk_drag_get_data( widget, - context, - GPOINTER_TO_INT (context->targets->data), - time ); - } - else + + if (!ret) { /* cancel the whole thing */ gtk_drag_finish( context, - FALSE, /* no success */ - FALSE, /* don't delete data on dropping side */ - time ); + FALSE, /* no success */ + FALSE, /* don't delete data on dropping side */ + time ); } - + /* 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; } @@ -263,72 +267,62 @@ static gboolean target_drag_drop( GtkWidget *widget, // ---------------------------------------------------------------------------- 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 ) + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *data, + guint WXUNUSED(info), + guint time, + wxDropTarget *drop_target ) { + if (g_isIdle) wxapp_install_idle_handler(); + /* Owen Taylor: "call gtk_drag_finish() with success == TRUE" */ - /* strangely, we get a "drag_data_received" event even when - we don't request them. this checks this. */ - if (!drop_target->m_currentDataObject) return; - - wxDataObject *data_object = drop_target->m_currentDataObject; +// 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; } - else + + /* 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 )) { - wxASSERT_MSG( data->target == data_object->GetFormat().GetAtom(), "DnD GetData target mismatch." ); - - if (data_object->GetFormat().GetType() == wxDF_TEXT) - { - wxTextDataObject *text_object = (wxTextDataObject*)data_object; - text_object->SetText( (const char*)data->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*)data->data, (size_t)data->length ); - } - - /* tell wxDropTarget that data transfer was successfull */ - drop_target->m_dataRetrieveSuccess = TRUE; - - /* tell GTK that data transfer was successfull */ + /* tell GTK that data transfer was successfull */ gtk_drag_finish( context, TRUE, FALSE, time ); } + else + { + /* tell GTK that data transfer was not successfull */ + gtk_drag_finish( context, FALSE, FALSE, time ); + } - /* tell wxDropTarget that data has arrived (or not) */ - drop_target->m_waiting = FALSE; + /* after this, invalidate the drop_target's drag data */ + drop_target->SetDragData( (GtkSelectionData*) NULL ); } -// ---------------------------------------------------------------------------- +//---------------------------------------------------------------------------- // wxDropTarget -// ---------------------------------------------------------------------------- +//---------------------------------------------------------------------------- wxDropTarget::wxDropTarget() { m_firstMotion = TRUE; m_dragContext = (GdkDragContext*) NULL; m_dragWidget = (GtkWidget*) NULL; + m_dragData = (GtkSelectionData*) NULL; m_dragTime = 0; - m_currentDataObject = (wxDataObject*) NULL; - m_dataRetrieveSuccess = FALSE; } wxDropTarget::~wxDropTarget() @@ -343,127 +337,164 @@ void wxDropTarget::OnLeave() { } -bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { return TRUE; } -bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) ) { return FALSE; } +bool wxDropTarget::OnData( long WXUNUSED(x), long WXUNUSED(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 ) -{ +{ 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; } return FALSE; } - -bool wxDropTarget::GetData( wxDataObject *data ) + +bool wxDropTarget::GetData( wxDataObject *data_object ) { - if (!m_dragContext) return FALSE; - if (!m_dragWidget) return FALSE; - - m_currentDataObject = data; - m_dataRetrieveSuccess = FALSE; - - /* this should trigger an "drag_data_received" event */ - gtk_drag_get_data( m_dragWidget, - m_dragContext, - data->GetFormat().GetAtom(), - m_dragTime ); - - /* wait for the "drag_data_received" event */ - m_waiting = TRUE; - while (m_waiting) gtk_main_iteration(); - - m_currentDataObject = (wxDataObject*) NULL; - - return m_dataRetrieveSuccess; + if (!m_dragData) return FALSE; + + if (m_dragData->target != data_object->GetFormat().GetAtom()) return FALSE; + + if (data_object->GetFormat().GetType() == wxDF_TEXT) + { + wxTextDataObject *text_object = (wxTextDataObject*)data_object; + text_object->SetText( (const char*)m_dragData->data ); + } else + + if (data_object->GetFormat().GetType() == wxDF_FILENAME) + { + } else + + if (data_object->GetFormat().GetType() == wxDF_PRIVATE) + { + wxPrivateDataObject *priv_object = (wxPrivateDataObject*)data_object; + priv_object->SetData( (const char*)m_dragData->data, (size_t)m_dragData->length ); + } + + return TRUE; } - + void wxDropTarget::UnregisterWidget( GtkWidget *widget ) { - wxCHECK_RET( widget != NULL, "unregister widget is NULL" ); - + wxCHECK_RET( widget != NULL, _T("unregister widget is NULL") ); + gtk_drag_dest_unset( widget ); - + gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); } void wxDropTarget::RegisterWidget( GtkWidget *widget ) { - wxCHECK_RET( widget != NULL, "register widget is NULL" ); - + wxCHECK_RET( widget != NULL, _T("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 + to allow dropping on only a small area. we should set GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice highlighting if dragging over standard controls, but this seems to be broken without the other two. */ - + gtk_drag_dest_set( widget, - (GtkDestDefaults) 0, /* no default behaviour */ - (GtkTargetEntry*) NULL, /* we don't supply any formats here */ - 0, /* number of targets = 0 */ - (GdkDragAction) 0 ); /* we don't supply any actions here */ - + (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_FUNC(target_drag_leave), (gpointer) this ); gtk_signal_connect( GTK_OBJECT(widget), "drag_motion", - GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); gtk_signal_connect( GTK_OBJECT(widget), "drag_drop", - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received", - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); + GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); } //------------------------------------------------------------------------- // wxTextDropTarget //------------------------------------------------------------------------- -bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxTextDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) +{ + return IsSupported( wxDF_TEXT ); +} + +bool wxTextDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) ) { - return IsSupported( wxDF_TEXT ); // same as "STRING" + if (IsSupported( wxDF_TEXT )) + { + RequestData( wxDF_TEXT ); + return TRUE; + } + + return FALSE; } -bool wxTextDropTarget::OnDrop( int x, int y ) +bool wxTextDropTarget::OnData( long x, long y ) { - if (!IsSupported( wxDF_TEXT )) return FALSE; - wxTextDataObject data; if (!GetData( &data )) return FALSE; - + OnDropText( x, y, data.GetText() ); + return TRUE; } @@ -481,20 +512,31 @@ wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id ) m_id = id; } -bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxPrivateDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { return IsSupported( m_id ); } -bool wxPrivateDropTarget::OnDrop( int x, int y ) +bool wxPrivateDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) ) +{ + if (!IsSupported( m_id )) + { + RequestData( m_id ); + return FALSE; + } + + return FALSE; +} + +bool wxPrivateDropTarget::OnData( long x, long y ) { if (!IsSupported( m_id )) return FALSE; - + wxPrivateDataObject data; if (!GetData( &data )) return FALSE; - + OnDropData( x, y, data.GetData(), data.GetSize() ); - + return TRUE; } @@ -502,546 +544,173 @@ bool wxPrivateDropTarget::OnDrop( int x, int y ) // A drop target which accepts files (dragged from File Manager or Explorer) //---------------------------------------------------------------------------- -bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) +bool wxFileDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { - return IsSupported( wxDF_FILENAME ); // same as "file:ALL" + return IsSupported( wxDF_FILENAME ); } -bool wxFileDropTarget::OnDrop( int x, int y ) +bool wxFileDropTarget::OnDrop( long x, long y ) { - return IsSupported( wxDF_FILENAME ); // same as "file:ALL" + if (IsSupported( wxDF_FILENAME )) + { + RequestData( wxDF_FILENAME ); + return TRUE; + } + + return FALSE; } -void wxFileDropTarget::OnData( int x, int y ) +bool wxFileDropTarget::OnData( long x, long y ) { wxFileDataObject data; - if (!GetData( &data )) return; + if (!GetData( &data )) return FALSE; /* get number of substrings /root/mytext.txt/0/root/myothertext.txt/0/0 */ size_t number = 0; size_t i; size_t size = data.GetFiles().Length(); - char *text = WXSTRINGCAST data.GetFiles(); + wxChar *text = WXSTRINGCAST data.GetFiles(); for ( i = 0; i < size; i++) if (text[i] == 0) number++; - if (number == 0) return; - - char **files = new char*[number]; - + if (number == 0) return FALSE; + + wxChar **files = new wxChar*[number]; + text = WXSTRINGCAST data.GetFiles(); for (i = 0; i < number; i++) { files[i] = text; - int len = strlen( text ); + int len = wxStrlen( text ); text += len+1; } - OnDropFiles( x, y, number, files ); - - free( files ); -} - -//------------------------------------------------------------------------- -// 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 ); -} - -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 ); -} - -wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win ) -{ - g_blockEventsOnDrag = TRUE; - - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; - m_retValue = wxDragCancel; - - m_data = data; - - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); -} - -void wxDropSource::SetData( wxDataObject *data ) -{ - if (m_data) delete m_data; - - if (data) - { - m_data = new wxDataBroker(); - m_data->Add( data ); - } - else - { - m_data = (wxDataBroker*) NULL; - } -} - -void wxDropSource::SetData( wxDataBroker *data ) -{ - if (m_data) delete m_data; - - m_data = data; -} - -wxDropSource::~wxDropSource(void) -{ - if (m_data) delete m_data; - - g_blockEventsOnDrag = FALSE; -} - -wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) -{ - wxASSERT_MSG( m_data, "wxDragSource: no data" ); - - if (!m_data) return (wxDragResult) wxDragNone; - - 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; -} + OnDropFiles( x, y, number, files ); -void wxDropSource::RegisterWindow(void) -{ - if (!m_data) return; -} + free( files ); -void wxDropSource::UnregisterWindow(void) -{ - if (!m_widget) return; + return TRUE; } - -#else // NEW_CODE - //---------------------------------------------------------------------------- -// forward +// "drag_data_get" //---------------------------------------------------------------------------- -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_get (GtkWidget *WXUNUSED(widget), + GdkDragContext *context, + GtkSelectionData *selection_data, + guint WXUNUSED(info), + guint WXUNUSED(time), + wxDropSource *drop_source ) { - if (target) - target->OnEnter(); -} - -//----------------------------------------------------------------------------- -// "drop_leave_event" -//----------------------------------------------------------------------------- + if (g_isIdle) wxapp_install_idle_handler(); -static void gtk_target_leave_callback( GtkWidget *WXUNUSED(widget), - GdkEventDropLeave *WXUNUSED(event), - wxDropTarget *target ) -{ - if (target) - target->OnLeave(); -} +// printf( "Provide data!\n" ); -//----------------------------------------------------------------------------- -// "drop_data_available_event" -//----------------------------------------------------------------------------- +// char *name = gdk_atom_name( selection_data->target ); +// if (name) printf( "Format requested: %s.\n", name ); -static void gtk_target_callback( GtkWidget *widget, - GdkEventDropDataAvailable *event, - wxDropTarget *target ) -{ - if (target) + wxNode *node = drop_source->m_data->m_dataObjects.First(); + while (node) { - 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 ); - } + wxDataObject *data_object = (wxDataObject*) node->Data(); + if (data_object->GetFormat().GetAtom() == selection_data->target) + { +// printf( "format found.\n" ); -/* - g_free (event->data); - g_free (event->data_type); -*/ -} + size_t data_size = data_object->GetSize(); -// ---------------------------------------------------------------------------- -// wxDropTarget -// ---------------------------------------------------------------------------- + if (data_size > 0) + { +// printf( "data size: %d.\n", (int)data_size ); -wxDropTarget::wxDropTarget() -{ - m_format = (wxDataFormat*) NULL; -} + guchar *buffer = new guchar[data_size]; + data_object->WriteData( buffer ); -wxDropTarget::~wxDropTarget() -{ - if (m_format) delete m_format; -} - -wxDataFormat &wxDropTarget::GetFormat(size_t n) const -{ - return (*m_format); -} + gtk_selection_data_set( selection_data, + selection_data->target, + 8, // 8-bit + buffer, + data_size ); -void wxDropTarget::UnregisterWidget( GtkWidget *widget ) -{ - if (!widget) return; - - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this ); + free( buffer ); - gtk_widget_dnd_drop_set( widget, FALSE, (gchar **) NULL, 0, FALSE ); -} + /* so far only copy, no moves. TODO. */ + drop_source->m_retValue = wxDragCopy; -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; + return; + } } - } - - 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; -} + node = node->Next(); + } -size_t wxTextDropTarget::GetFormatCount() const -{ - return 1; + drop_source->m_retValue = wxDragCancel; } -// ---------------------------------------------------------------------------- -// wxPrivateDropTarget -// ---------------------------------------------------------------------------- +//---------------------------------------------------------------------------- +// "drag_data_delete" +//---------------------------------------------------------------------------- -wxPrivateDropTarget::wxPrivateDropTarget() +static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), + GdkDragContext *WXUNUSED(context), + wxDropSource *drop_source ) { - m_id = wxTheApp->GetAppName(); - m_format = new wxDataFormat( m_id ); -} + if (g_isIdle) wxapp_install_idle_handler(); -void wxPrivateDropTarget::SetId( const wxString& id ) -{ - m_id = id; - m_format->SetId( id ); -} +// printf( "Delete the data!\n" ); -size_t wxPrivateDropTarget::GetFormatCount() const -{ - return 1; + drop_source->m_retValue = wxDragMove; } -// ---------------------------------------------------------------------------- -// wxFileDropTarget -// ---------------------------------------------------------------------------- - -wxFileDropTarget::wxFileDropTarget() -{ - m_format = new wxDataFormat( wxDF_FILENAME ); -} +//---------------------------------------------------------------------------- +// "drag_begin" +//---------------------------------------------------------------------------- -bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] ) +static void source_drag_begin( GtkWidget *WXUNUSED(widget), + GdkDragContext *WXUNUSED(context), + wxDropSource *WXUNUSED(drop_source) ) { - printf( "Got %d dropped files.\n", (int)nFiles ); - printf( "At x: %d, y: %d.\n", (int)x, (int)y ); + if (g_isIdle) wxapp_install_idle_handler(); - for (size_t i = 0; i < nFiles; i++) - { - printf( aszFiles[i] ); - printf( "\n" ); - } - - return TRUE; +// printf( "drag_begin.\n" ); } -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++; +//---------------------------------------------------------------------------- +// "drag_end" +//---------------------------------------------------------------------------- - 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; - } +static void source_drag_end( GtkWidget *WXUNUSED(widget), + GdkDragContext *WXUNUSED(context), + wxDropSource *drop_source ) +{ + if (g_isIdle) wxapp_install_idle_handler(); - bool ret = OnDropFiles( x, y, 1, files ); - - free( files ); - - return ret; -} +// printf( "drag_end.\n" ); -size_t wxFileDropTarget::GetFormatCount() const -{ - return 1; + drop_source->m_waiting = FALSE; } -//------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // 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; - + m_waiting = TRUE; + m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; - + m_data = (wxDataBroker*) NULL; m_retValue = wxDragCancel; m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); m_goaheadCursor = wxCursor( wxCURSOR_HAND ); - + m_goIcon = go; if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm ); m_stopIcon = stop; @@ -1050,17 +719,17 @@ wxDropSource::wxDropSource( 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; if (win->m_wxwindow) m_widget = win->m_wxwindow; m_retValue = wxDragCancel; - + if (data) { m_data = new wxDataBroker(); - m_data->Add( data ); + m_data->Add( data ); } else { @@ -1069,7 +738,7 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, 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; @@ -1078,13 +747,11 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win ) { - g_blockEventsOnDrag = TRUE; - m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; m_retValue = wxDragCancel; - + m_data = data; m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); @@ -1094,11 +761,11 @@ wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win ) void wxDropSource::SetData( wxDataObject *data ) { if (m_data) delete m_data; - + if (data) { m_data = new wxDataBroker(); - m_data->Add( data ); + m_data->Add( data ); } else { @@ -1109,7 +776,7 @@ void wxDropSource::SetData( wxDataObject *data ) void wxDropSource::SetData( wxDataBroker *data ) { if (m_data) delete m_data; - + m_data = data; } @@ -1119,280 +786,102 @@ wxDropSource::~wxDropSource(void) g_blockEventsOnDrag = FALSE; } - + wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) { - if (gdk_dnd.dnd_grabbed) return (wxDragResult) wxDragNone; - if (gdk_dnd.drag_really) return (wxDragResult) wxDragNone; - - wxASSERT_MSG( m_data, "wxDragSource: no data" ); - + wxASSERT_MSG( m_data, _T("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); - } - - - 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(); - - 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 ); - - gs_currentDropSource = this; - - while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield(); - - gs_currentDropSource = (wxDropSource*) NULL; - - UnregisterWindow(); - - g_blockEventsOnDrag = FALSE; - - return m_retValue; -} -void wxDropSource::RegisterWindow(void) -{ - if (!m_data) return; + m_waiting = TRUE; - wxString formats; - - wxNode *node = m_data->m_dataObjects.First(); - while (node) - { - wxDataObject* dobj = (wxDataObject*) node->Data(); - - 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 ); + GdkAtom atom = gdk_atom_intern( "STRING", FALSE ); +// wxPrintf( _T("atom id: %d.\n"), (int)atom ); - gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event", - GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this ); -} + GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 ); + gtk_target_list_add( target_list, atom, 0, 0 ); -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 ); -} + GdkEventMotion event; + event.window = m_widget->window; + int x = 0; + int y = 0; + GdkModifierType state; + gdk_window_get_pointer( event.window, &x, &y, &state ); + event.x = x; + event.y = y; + event.state = state; + event.time = GDK_CURRENT_TIME; + + /* GTK wants to know which button was pressed which caused the dragging */ + int button_number = 0; + if (event.state & GDK_BUTTON1_MASK) button_number = 1; + else if (event.state & GDK_BUTTON2_MASK) button_number = 2; + else if (event.state & GDK_BUTTON3_MASK) button_number = 3; + + /* 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 (m_waiting) gtk_main_iteration();; + } + g_blockEventsOnDrag = FALSE; -/* - * Shaped Windows - */ -static GdkWindow *root_win = (GdkWindow*) NULL; + UnregisterWindow(); -typedef struct _cursoroffset {gint x,y;} CursorOffset; + return m_retValue; +} -static void -shape_pressed (GtkWidget *widget, GdkEventButton *event) +void wxDropSource::RegisterWindow() { - 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); -} + if (!m_widget) return; + gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get", + GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this); + gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete", + GTK_SIGNAL_FUNC (source_drag_data_delete), (gpointer) this ); + gtk_signal_connect (GTK_OBJECT(m_widget), "drag_begin", + GTK_SIGNAL_FUNC (source_drag_begin), (gpointer) this ); + gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end", + GTK_SIGNAL_FUNC (source_drag_end), (gpointer) this ); -static void -shape_released (GtkWidget *widget) -{ - gtk_grab_remove (widget); - gdk_pointer_ungrab (0); } -static void -shape_motion (GtkWidget *widget, - GdkEventMotion * /*event*/ ) +void wxDropSource::UnregisterWindow() { - 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 ); -} + if (!m_widget) return; -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 - // wxUSE_DRAG_AND_DROP \ No newline at end of file + // wxUSE_DRAG_AND_DROP