X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b666df2c102d1e183532adf0c003e63b1a591e2f..503f414edd46512b73e9abee54ff988eca42451e:/src/gtk1/dnd.cpp diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index 4ac5d9bc3c..df6de3a991 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,373 +25,41 @@ #include "gtk/gtk.h" #include "gdk/gdkprivate.h" -#include - -// ---------------------------------------------------------------------------- -// global -// ---------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; - -#ifdef NEW_GTK_DND_CODE - #include "gtk/gtkdnd.h" #include "gtk/gtkselection.h" -// ---------------------------------------------------------------------------- -// "drag_leave" -// ---------------------------------------------------------------------------- - -static void target_drag_leave( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - guint WXUNUSED(time) ) -{ - printf( "leave.\n" ); -} - -// ---------------------------------------------------------------------------- -// "drag_motion" -// ---------------------------------------------------------------------------- - -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; -} - -// ---------------------------------------------------------------------------- -// "drag_drop" -// ---------------------------------------------------------------------------- - -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) - { - gtk_drag_get_data( widget, - context, - GPOINTER_TO_INT (context->targets->data), - time ); - } - return FALSE; -} - -// ---------------------------------------------------------------------------- -// "drag_data_received" -// ---------------------------------------------------------------------------- - -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)) - { - wxString str = (const char*)data->data; - printf( "Received %s\n.", WXSTRINGCAST str ); - gtk_drag_finish( context, TRUE, FALSE, time ); - return; - } - - gtk_drag_finish (context, FALSE, FALSE, time); -} - -// ---------------------------------------------------------------------------- -// wxDropTarget -// ---------------------------------------------------------------------------- - -wxDropTarget::wxDropTarget() -{ -} - -wxDropTarget::~wxDropTarget() -{ -} - -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 ); - - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - 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_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); -} - -void wxDropTarget::RegisterWidget( GtkWidget *widget ) -{ - wxCHECK_RET( widget != NULL, "register widget is NULL" ); - - GtkTargetEntry format; - format.info = 0; - format.flags = 0; - char buf[100]; - - int valid = 0; - for ( size_t i = 0; i < GetFormatCount(); i++ ) - { - wxDataFormat df = GetFormat( i ); - switch (df) - { - case wxDF_TEXT: - format.target = "text/plain"; - valid++; - break; - case wxDF_FILENAME: - format.target = "file:ALL"; - valid++; - break; - case wxDF_PRIVATE: - wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this; - strcpy( buf, "applications/" ); - strcat( buf, WXSTRINGCAST pdt->GetID() ); - format.target = buf; - valid++; - default: - break; - } - } - - 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 ); - - gtk_signal_connect( GTK_OBJECT(widget), "drag_motion", - GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); - - gtk_signal_connect( GTK_OBJECT(widget), "drag_drop", - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); - - gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received", - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); -} - -// ---------------------------------------------------------------------------- -// wxTextDropTarget -// ---------------------------------------------------------------------------- - -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; -} - -wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const -{ - return wxDF_TEXT; -} - -// ---------------------------------------------------------------------------- -// wxFileDropTarget -// ---------------------------------------------------------------------------- - -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; -} - -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; -} - -wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const -{ - return wxDF_FILENAME; -} - -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- - -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; - - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); -} - -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; - - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); -} - -void wxDropSource::SetData( wxDataObject &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; - if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone; - - RegisterWindow(); - - // TODO - - UnregisterWindow(); - - g_blockEventsOnDrag = FALSE; - - return m_retValue; -} +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- -void wxDropSource::RegisterWindow(void) -{ - if (!m_data) return; +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; - 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 -} +//----------------------------------------------------------------------------- +// thread system +//----------------------------------------------------------------------------- -void wxDropSource::UnregisterWindow(void) -{ - if (!m_widget) return; - - // TODO -} +#if wxUSE_THREADS +extern void wxapp_install_thread_wakeup(); +extern void wxapp_uninstall_thread_wakeup(); +#endif +//---------------------------------------------------------------------------- +// global data +//---------------------------------------------------------------------------- -#else // NEW_CODE +extern bool g_blockEventsOnDrag; -GtkWidget *shape_create_icon (char **data, - gint x, - gint y, - gint px, - gint py, - gint window_type); +//---------------------------------------------------------------------------- +// standard icons +//---------------------------------------------------------------------------- /* 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", " ", " ", " ...... ", @@ -426,17 +94,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.. ", @@ -470,632 +138,788 @@ static char * page_xpm[] = { " .XXXXXXXXXXXXXXXXXXXXXXX. ", " .XXXXXXXXXXXXXXXXXXXXXXX. ", " ......................... "}; - - -//----------------------------------------------------------------------------- -// globals -//----------------------------------------------------------------------------- -wxDropSource *gs_currentDropSource = (wxDropSource*) NULL; -//----------------------------------------------------------------------------- -// "drop_enter_event" -//----------------------------------------------------------------------------- -static void gtk_target_enter_callback( GtkWidget *WXUNUSED(widget), - GdkEventDropEnter *WXUNUSED(event), - wxDropTarget *target ) +// ---------------------------------------------------------------------------- +// "drag_leave" +// ---------------------------------------------------------------------------- + +static void target_drag_leave( GtkWidget *WXUNUSED(widget), + GdkDragContext *context, + guint WXUNUSED(time), + wxDropTarget *drop_target ) { - if (target) - target->OnEnter(); + 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 ); } -//----------------------------------------------------------------------------- -// "drop_leave_event" -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// "drag_motion" +// ---------------------------------------------------------------------------- -static void gtk_target_leave_callback( GtkWidget *WXUNUSED(widget), - GdkEventDropLeave *WXUNUSED(event), - wxDropTarget *target ) +static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), + GdkDragContext *context, + gint x, + gint y, + guint time, + wxDropTarget *drop_target ) { - if (target) - target->OnLeave(); + 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(); + } + + /* 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; } -//----------------------------------------------------------------------------- -// "drop_data_available_event" -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// "drag_drop" +// ---------------------------------------------------------------------------- -static void gtk_target_callback( GtkWidget *widget, - GdkEventDropDataAvailable *event, - wxDropTarget *target ) +static gboolean target_drag_drop( GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + wxDropTarget *drop_target ) { - if (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) { - 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 ); + /* cancel the whole thing */ + gtk_drag_finish( context, + FALSE, /* no success */ + FALSE, /* don't delete data on dropping side */ + time ); } -/* - g_free (event->data); - g_free (event->data_type); -*/ + /* 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; } // ---------------------------------------------------------------------------- -// wxDropTarget +// "drag_data_received" // ---------------------------------------------------------------------------- +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 ) +{ + if (g_isIdle) wxapp_install_idle_handler(); + + /* 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 )) + { + /* tell GTK that data transfer was successfull */ + gtk_drag_finish( context, TRUE, FALSE, time ); + } + else + { + /* tell GTK that data transfer was not successfull */ + gtk_drag_finish( context, FALSE, FALSE, time ); + } + + /* after this, invalidate the drop_target's drag data */ + drop_target->SetDragData( (GtkSelectionData*) NULL ); +} + +//---------------------------------------------------------------------------- +// wxDropTarget +//---------------------------------------------------------------------------- + wxDropTarget::wxDropTarget() { + m_firstMotion = TRUE; + m_dragContext = (GdkDragContext*) NULL; + m_dragWidget = (GtkWidget*) NULL; + m_dragData = (GtkSelectionData*) NULL; + m_dragTime = 0; } wxDropTarget::~wxDropTarget() { } -void wxDropTarget::UnregisterWidget( GtkWidget *widget ) +void wxDropTarget::OnEnter() { - 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 ); +void wxDropTarget::OnLeave() +{ } -void wxDropTarget::RegisterWidget( GtkWidget *widget ) +bool wxDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { - wxString formats; - int valid = 0; - - for ( size_t i = 0; i < GetFormatCount(); i++ ) - { - wxDataFormat df = GetFormat( i ); - switch (df) - { - case wxDF_TEXT: - { - if (i > 0) formats += ";"; - formats += "text/plain"; - valid++; - break; - } - case wxDF_FILENAME: - { - if (i > 0) formats += ";"; - formats += "file:ALL"; - valid++; - break; - } - case wxDF_PRIVATE: - { - if (i > 0) formats += ";"; - wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this; - formats += "applications/"; - 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 ); + return TRUE; } -// ---------------------------------------------------------------------------- -// wxTextDropTarget -// ---------------------------------------------------------------------------- +bool wxDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) ) +{ + return FALSE; +} -bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) +bool wxDropTarget::OnData( long WXUNUSED(x), long WXUNUSED(y) ) { - OnDropText( x, y, (const char*)data ); - return TRUE; + return FALSE; } -bool wxTextDropTarget::OnDropText( long x, long y, const char *psz ) +bool wxDropTarget::RequestData( wxDataFormat format ) { + if (!m_dragContext) return FALSE; + if (!m_dragWidget) return FALSE; + /* - printf( "Got dropped text: %s.\n", psz ); - printf( "At x: %d, y: %d.\n", (int)x, (int)y ); + 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") ); */ + +#if wxUSE_THREADS + /* disable GUI threads */ + wxapp_uninstall_thread_wakeup(); +#endif + + /* this should trigger an "drag_data_received" event */ + gtk_drag_get_data( m_dragWidget, + m_dragContext, + format.GetAtom(), + m_dragTime ); + +#if wxUSE_THREADS + /* re-enable GUI threads */ + wxapp_install_thread_wakeup(); +#endif + return TRUE; } -size_t wxTextDropTarget::GetFormatCount() const +bool wxDropTarget::IsSupported( wxDataFormat format ) +{ + if (!m_dragContext) return FALSE; + + GList *child = m_dragContext->targets; + while (child) + { + GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data); + +// char *name = gdk_atom_name( formatAtom ); +// if (name) printf( "Format available: %s.\n", name ); + + if (formatAtom == format.GetAtom()) return TRUE; + child = child->next; + } + + return FALSE; +} + +bool wxDropTarget::GetData( wxDataObject *data_object ) { - return 1; + 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; } -wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const +void wxDropTarget::UnregisterWidget( GtkWidget *widget ) { - return wxDF_TEXT; + 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_disconnect_by_func( GTK_OBJECT(widget), + 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_disconnect_by_func( GTK_OBJECT(widget), + GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); } -// ---------------------------------------------------------------------------- +void wxDropTarget::RegisterWidget( GtkWidget *widget ) +{ + 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 + 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 */ + + gtk_signal_connect( GTK_OBJECT(widget), "drag_leave", + GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); + + gtk_signal_connect( GTK_OBJECT(widget), "drag_motion", + GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); + + gtk_signal_connect( GTK_OBJECT(widget), "drag_drop", + GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); + + gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received", + GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); +} + +//------------------------------------------------------------------------- +// wxTextDropTarget +//------------------------------------------------------------------------- + +bool wxTextDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) +{ + return IsSupported( wxDF_TEXT ); +} + +bool wxTextDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) ) +{ + if (IsSupported( wxDF_TEXT )) + { + RequestData( wxDF_TEXT ); + return TRUE; + } + + return FALSE; +} + +bool wxTextDropTarget::OnData( long x, long y ) +{ + wxTextDataObject data; + if (!GetData( &data )) return FALSE; + + OnDropText( x, y, data.GetText() ); + + return TRUE; +} + +//------------------------------------------------------------------------- // wxPrivateDropTarget -// ---------------------------------------------------------------------------- +//------------------------------------------------------------------------- wxPrivateDropTarget::wxPrivateDropTarget() { m_id = wxTheApp->GetAppName(); } -size_t wxPrivateDropTarget::GetFormatCount() const +wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id ) { - return 1; + m_id = id; } -wxDataFormat wxPrivateDropTarget::GetFormat(size_t WXUNUSED(n)) const +bool wxPrivateDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { - return wxDF_PRIVATE; + return IsSupported( m_id ); } -// ---------------------------------------------------------------------------- -// wxFileDropTarget -// ---------------------------------------------------------------------------- +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; -bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] ) + OnDropData( x, y, data.GetData(), data.GetSize() ); + + return TRUE; +} + +//---------------------------------------------------------------------------- +// A drop target which accepts files (dragged from File Manager or Explorer) +//---------------------------------------------------------------------------- + +bool wxFileDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) { - printf( "Got %d dropped files.\n", (int)nFiles ); - printf( "At x: %d, y: %d.\n", (int)x, (int)y ); + return IsSupported( wxDF_FILENAME ); +} - for (size_t i = 0; i < nFiles; i++) +bool wxFileDropTarget::OnDrop( long x, long y ) +{ + if (IsSupported( wxDF_FILENAME )) { - printf( aszFiles[i] ); - printf( "\n" ); + RequestData( wxDF_FILENAME ); + return TRUE; } - - return TRUE; + + return FALSE; } -bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) +bool wxFileDropTarget::OnData( long x, long y ) { + wxFileDataObject data; + if (!GetData( &data )) return FALSE; + + /* get number of substrings /root/mytext.txt/0/root/myothertext.txt/0/0 */ size_t number = 0; - char *text = (char*) data; - for (size_t i = 0; i < size; i++) + size_t i; + size_t size = data.GetFiles().Length(); + wxChar *text = WXSTRINGCAST data.GetFiles(); + for ( i = 0; i < size; i++) if (text[i] == 0) number++; - if (number == 0) return TRUE; - - char **files = new char*[number]; - - text = (char*) data; - for (size_t i = 0; i < number; i++) + 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; } - bool ret = OnDropFiles( x, y, 1, files ); - + OnDropFiles( x, y, number, files ); + free( files ); - - return ret; + + return TRUE; } -size_t wxFileDropTarget::GetFormatCount() const +//---------------------------------------------------------------------------- +// "drag_data_get" +//---------------------------------------------------------------------------- + +static void +source_drag_data_get (GtkWidget *WXUNUSED(widget), + GdkDragContext *context, + GtkSelectionData *selection_data, + guint WXUNUSED(info), + guint WXUNUSED(time), + wxDropSource *drop_source ) { - return 1; + if (g_isIdle) wxapp_install_idle_handler(); + +// printf( "Provide data!\n" ); + +// char *name = gdk_atom_name( selection_data->target ); +// if (name) printf( "Format requested: %s.\n", name ); + + wxNode *node = drop_source->m_data->m_dataObjects.First(); + while (node) + { + wxDataObject *data_object = (wxDataObject*) node->Data(); + if (data_object->GetFormat().GetAtom() == selection_data->target) + { +// 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 ); + +#if wxUSE_THREADS + /* disable GUI threads */ + wxapp_uninstall_thread_wakeup(); +#endif + + gtk_selection_data_set( selection_data, + selection_data->target, + 8, // 8-bit + buffer, + data_size ); + +#if wxUSE_THREADS + /* enable GUI threads */ + wxapp_install_thread_wakeup(); +#endif + free( buffer ); + + /* so far only copy, no moves. TODO. */ + drop_source->m_retValue = wxDragCopy; + + return; + } + } + + node = node->Next(); + } + + drop_source->m_retValue = wxDragCancel; } -wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const +//---------------------------------------------------------------------------- +// "drag_data_delete" +//---------------------------------------------------------------------------- + +static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), + GdkDragContext *WXUNUSED(context), + wxDropSource *drop_source ) { - return wxDF_FILENAME; + if (g_isIdle) wxapp_install_idle_handler(); + +// printf( "Delete the data!\n" ); + + drop_source->m_retValue = wxDragMove; } -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- +//---------------------------------------------------------------------------- +// "drag_begin" +//---------------------------------------------------------------------------- -static void -shape_motion (GtkWidget *widget, - GdkEventMotion * /*event*/); - -//----------------------------------------------------------------------------- -// drag request +static void source_drag_begin( GtkWidget *WXUNUSED(widget), + GdkDragContext *WXUNUSED(context), + wxDropSource *WXUNUSED(drop_source) ) +{ + if (g_isIdle) wxapp_install_idle_handler(); -void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source ) +// printf( "drag_begin.\n" ); +} + +//---------------------------------------------------------------------------- +// "drag_end" +//---------------------------------------------------------------------------- + +static void source_drag_end( GtkWidget *WXUNUSED(widget), + GdkDragContext *WXUNUSED(context), + wxDropSource *drop_source ) { - wxDataObject *data = source->m_data; + if (g_isIdle) wxapp_install_idle_handler(); - switch (data->GetFormat()) - { - case wxDF_PRIVATE: - { - wxPrivateDataObject *pdo = (wxPrivateDataObject*) data; - - gtk_widget_dnd_data_set( widget, - event, - (unsigned char*) pdo->GetData(), - (int) pdo->GetDataSize() ); - - break; - } - case wxDF_TEXT: - { - wxTextDataObject *text_object = (wxTextDataObject*) data; - - wxString text = text_object->GetText(); - - char *s = WXSTRINGCAST text; - - gtk_widget_dnd_data_set( widget, - event, - (unsigned char*) s, - (int) text.Length()+1 ); - - break; - } - - case wxDF_FILENAME: - { - wxFileDataObject *file_object = (wxFileDataObject*) data; - - wxString text = file_object->GetFiles(); - - char *s = WXSTRINGCAST text; - - gtk_widget_dnd_data_set( widget, - event, - (unsigned char*) s, - (int) text.Length()+1 ); - - break; - } - - default: - { - return; - } - } - - source->m_retValue = wxDragCopy; +// printf( "drag_end.\n" ); + + drop_source->m_waiting = FALSE; } -wxDropSource::wxDropSource( wxWindow *win ) +//--------------------------------------------------------------------------- +// wxDropSource +//--------------------------------------------------------------------------- + +wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop ) { g_blockEventsOnDrag = TRUE; - + m_waiting = TRUE; + m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; - - m_data = (wxDataObject *) NULL; + + 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 ) +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; - - m_data = &data; + + 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 ); -} -void wxDropSource::SetData( wxDataObject &data ) -{ - m_data = &data; + m_goIcon = go; + if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm ); + m_stopIcon = stop; + if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm ); } -wxDropSource::~wxDropSource(void) +wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win ) { -// if (m_data) delete m_data; + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; + m_retValue = wxDragCancel; - g_blockEventsOnDrag = FALSE; + m_data = data; + + m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); + m_goaheadCursor = wxCursor( wxCURSOR_HAND ); } - -wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) + +void wxDropSource::SetData( wxDataObject *data ) { - 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; - - static GtkWidget *drag_icon = (GtkWidget*) NULL; - static GtkWidget *drop_icon = (GtkWidget*) NULL; + if (m_data) delete m_data; - GdkPoint hotspot_1 = {0,-5 }; - - if (!drag_icon) + if (data) { - 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); + m_data = new wxDataBroker(); + m_data->Add( data ); } - - GdkPoint hotspot_2 = {-5,-5}; - - if (!drop_icon) + else { - 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); + m_data = (wxDataBroker*) NULL; } - - - 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 ); - - 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) +void wxDropSource::SetData( wxDataBroker *data ) { - if (!m_data) return; + if (m_data) delete m_data; - wxString formats; - - wxDataFormat df = m_data->GetFormat(); - - switch (df) - { - case wxDF_TEXT: - { - formats += "text/plain"; - break; - } - case wxDF_FILENAME: - { - formats += "file:ALL"; - break; - } - case wxDF_PRIVATE: - { - wxPrivateDataObject* pdo = (wxPrivateDataObject*) m_data; - formats += "applications/"; - formats += pdo->GetId(); - break; - } - default: - break; - } - - char *str = WXSTRINGCAST formats; - - gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event", - GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this ); + m_data = data; } -void wxDropSource::UnregisterWindow(void) +wxDropSource::~wxDropSource(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 ); + if (m_data) delete m_data; + + g_blockEventsOnDrag = FALSE; } +wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) +{ + wxASSERT_MSG( m_data, _T("wxDragSource: no data") ); -/* - * Shaped Windows - */ -static GdkWindow *root_win = (GdkWindow*) NULL; + if (!m_data) return (wxDragResult) wxDragNone; -typedef struct _cursoroffset {gint x,y;} CursorOffset; + g_blockEventsOnDrag = TRUE; -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); -} + RegisterWindow(); + m_waiting = TRUE; -static void -shape_released (GtkWidget *widget) -{ - gtk_grab_remove (widget); - gdk_pointer_ungrab (0); + GdkAtom atom = gdk_atom_intern( "STRING", FALSE ); +// printf( "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; + 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; + +#if wxUSE_THREADS + /* disable GUI threads */ + wxapp_uninstall_thread_wakeup(); +#endif + + /* 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();; + } + +#if wxUSE_THREADS + /* re-enable GUI threads */ + wxapp_install_thread_wakeup(); +#endif + + g_blockEventsOnDrag = FALSE; + + UnregisterWindow(); + + return m_retValue; } -static void -shape_motion (GtkWidget *widget, - GdkEventMotion * /*event*/ ) +void wxDropSource::RegisterWindow() { - 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; + + 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 ); + } -GtkWidget * -shape_create_icon (char **data, - gint x, - gint y, - gint px, - gint py, - gint window_type) +void wxDropSource::UnregisterWindow() { - 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; + if (!m_widget) return; + + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this ); + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + GTK_SIGNAL_FUNC(source_drag_data_delete), (gpointer) this ); + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + GTK_SIGNAL_FUNC(source_drag_begin), (gpointer) this ); + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this ); } -#endif - // NEW_GTK_DND_CODE - #endif - // wxUSE_DRAG_AND_DROP \ No newline at end of file + // wxUSE_DRAG_AND_DROP