X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/513abb883f5b0d02a9458becb2802dc01479bd38..7391216edcb95b4e125c310120cf4b877c89073b:/src/gtk/dnd.cpp?ds=sidebyside diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index e9db01eda4..7c1834bf87 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -21,8 +21,8 @@ #include "wx/intl.h" #include "wx/utils.h" -#include -#include +#include "wx/gtk/private.h" + #include #include @@ -40,8 +40,6 @@ extern bool g_isIdle; //----------------------------------------------------------------------------- #if wxUSE_THREADS -extern void wxapp_install_thread_wakeup(); -extern void wxapp_uninstall_thread_wakeup(); #endif //---------------------------------------------------------------------------- @@ -50,12 +48,17 @@ extern void wxapp_uninstall_thread_wakeup(); extern bool g_blockEventsOnDrag; +// 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) +static const wxChar *TRACE_DND = _T("dnd"); + //---------------------------------------------------------------------------- // standard icons //---------------------------------------------------------------------------- /* XPM */ -static char * page_xpm[] = { +static const char * page_xpm[] = { /* width height ncolors chars_per_pixel */ "32 32 5 1", /* colors */ @@ -150,6 +153,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), wxDragResult result; if ( context->suggested_action == GDK_ACTION_COPY ) result = wxDragCopy; + else if ( context->suggested_action == GDK_ACTION_LINK ) + result = wxDragLink; else result = wxDragMove; @@ -170,6 +175,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), GdkDragAction action; if (result == wxDragCopy) action = GDK_ACTION_COPY; + else if (result == wxDragLink) + action = GDK_ACTION_LINK; else action = GDK_ACTION_MOVE; @@ -230,12 +237,12 @@ static gboolean target_drag_drop( GtkWidget *widget, 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) { - wxLogDebug( wxT( "Drop target: OnDrop returned FALSE") ); + wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") ); /* cancel the whole thing */ gtk_drag_finish( context, @@ -245,11 +252,10 @@ static gboolean target_drag_drop( GtkWidget *widget, } else { - wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") ); + wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned TRUE") ); #if wxUSE_THREADS /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); #endif GdkAtom format = drop_target->GetMatchingPair(); @@ -268,7 +274,6 @@ static gboolean target_drag_drop( GtkWidget *widget, #if wxUSE_THREADS /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); #endif } @@ -311,7 +316,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), return; } - wxLogDebug( wxT( "Drop target: data received event") ); + wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") ); /* inform the wxDropTarget about the current GtkSelectionData. this is only valid for the duration of this call */ @@ -320,19 +325,21 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), wxDragResult result; if ( context->suggested_action == GDK_ACTION_COPY ) result = wxDragCopy; + else if ( context->suggested_action == GDK_ACTION_LINK ) + result = wxDragLink; else result = wxDragMove; if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) ) { - wxLogDebug( wxT( "Drop target: OnData returned TRUE") ); + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") ); /* tell GTK that data transfer was successfull */ gtk_drag_finish( context, TRUE, FALSE, time ); } else { - wxLogDebug( wxT( "Drop target: OnData returned FALSE") ); + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") ); /* tell GTK that data transfer was not successfull */ gtk_drag_finish( context, FALSE, FALSE, time ); @@ -406,7 +413,8 @@ GdkAtom wxDropTarget::GetMatchingPair() wxDataFormat format( formatAtom ); #ifdef __WXDEBUG__ - wxLogDebug( wxT("Drop target: drag has format: %s"), format.GetId().c_str() ); + wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"), + format.GetId().c_str()); #endif // Debug if (m_dataObject->IsSupportedFormat( format )) @@ -504,7 +512,8 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), wxDataFormat format( selection_data->target ); - wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() ); + wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"), + format.GetId().c_str()); drop_source->m_retValue = wxDragCancel; @@ -512,19 +521,19 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), if (!data) { - wxLogDebug( wxT("Drop source: no data object") ); + wxLogTrace(TRACE_DND, wxT("Drop source: no data object") ); return; } if (!data->IsSupportedFormat(format)) { - wxLogDebug( wxT("Drop source: unsupported format") ); + wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") ); return; } if (data->GetDataSize(format) == 0) { - wxLogDebug( wxT("Drop source: empty data") ); + wxLogTrace(TRACE_DND, wxT("Drop source: empty data") ); return; } @@ -542,7 +551,6 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), #if wxUSE_THREADS /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); #endif gtk_selection_data_set( selection_data, @@ -553,7 +561,6 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), #if wxUSE_THREADS /* enable GUI threads */ - wxapp_install_thread_wakeup(); #endif delete[] d; @@ -563,9 +570,9 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), // "drag_data_delete" //---------------------------------------------------------------------------- -static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - wxDropSource *WXUNUSED(drop_source) ) +static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), + GdkDragContext *context, + wxDropSource *WXUNUSED(drop_source) ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -614,6 +621,7 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur wxDragResult action = wxDragNone; if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy; + if (source->m_dragContext->action == GDK_ACTION_LINK) action = wxDragLink; if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove; source->GiveFeedback( action ); @@ -748,7 +756,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove ) // still in drag if (g_blockEventsOnDrag) return (wxDragResult) wxDragNone; - + // disabled for now g_blockEventsOnDrag = TRUE; @@ -763,7 +771,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove ) for (size_t i = 0; i < m_data->GetFormatCount(); i++) { GdkAtom atom = array[i]; - wxLogDebug( wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ) ); + wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom )); gtk_target_list_add( target_list, atom, 0, 0 ); } delete[] array; @@ -787,17 +795,17 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove ) #if wxUSE_THREADS /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); #endif /* don't start dragging if no button is down */ if (button_number) { - GdkDragAction action = GDK_ACTION_COPY; - if (allowMove) action = (GdkDragAction)(GDK_ACTION_MOVE|GDK_ACTION_COPY); + int action = GDK_ACTION_COPY; + if ( allowMove ) + action |= GDK_ACTION_MOVE; GdkDragContext *context = gtk_drag_begin( m_widget, target_list, - action, + (GdkDragAction)action, button_number, /* number of mouse button which started drag */ (GdkEvent*) &event ); @@ -809,13 +817,14 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove ) if (context->action == GDK_ACTION_COPY) m_retValue = wxDragCopy; + if (context->action == GDK_ACTION_LINK) + m_retValue = wxDragLink; if (context->action == GDK_ACTION_MOVE) m_retValue = wxDragMove; } #if wxUSE_THREADS /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); #endif g_blockEventsOnDrag = FALSE;