X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98528e9b9451c2b82911407d0a6d9fb22e4160ac..f31bbefd1070af6162b9deeda9d4e528efbc1b31:/src/gtk/dnd.cpp diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 0733a6e2e4..c995a53350 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -23,12 +23,7 @@ #include "wx/gdicmn.h" #endif -#include "wx/gtk/private.h" - -#include - -#include -#include +#include //---------------------------------------------------------------------------- // global data @@ -167,8 +162,6 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget), 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 ); @@ -197,8 +190,6 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), 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" */ @@ -295,8 +286,6 @@ static gboolean target_drag_drop( GtkWidget *widget, 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 @@ -337,7 +326,7 @@ static gboolean target_drag_drop( GtkWidget *widget, #ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") ); #endif - + /* cancel the whole thing */ gtk_drag_finish( context, FALSE, /* no success */ @@ -349,7 +338,7 @@ static gboolean target_drag_drop( GtkWidget *widget, #ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") ); #endif - + #if wxUSE_THREADS /* disable GUI threads */ #endif @@ -402,8 +391,6 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), guint time, wxDropTarget *drop_target ) { - if (g_isIdle) wxapp_install_idle_handler(); - /* Owen Taylor: "call gtk_drag_finish() with success == TRUE" */ @@ -419,7 +406,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), #ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") ); #endif - + /* inform the wxDropTarget about the current GtkSelectionData. this is only valid for the duration of this call */ drop_target->SetDragData( data ); @@ -431,7 +418,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), #ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") ); #endif - + /* tell GTK that data transfer was successful */ gtk_drag_finish( context, TRUE, FALSE, time ); } @@ -440,7 +427,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), #ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") ); #endif - + /* tell GTK that data transfer was not successful */ gtk_drag_finish( context, FALSE, FALSE, time ); } @@ -607,15 +594,13 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), guint WXUNUSED(time), wxDropSource *drop_source ) { - if (g_isIdle) wxapp_install_idle_handler(); - wxDataFormat format( selection_data->target ); #ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"), format.GetId().c_str()); #endif - + drop_source->m_retValue = wxDragCancel; wxDataObject *data = drop_source->GetDataObject(); @@ -674,38 +659,6 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), } } -//---------------------------------------------------------------------------- -// "drag_data_delete" -//---------------------------------------------------------------------------- - -extern "C" { -static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - wxDropSource *WXUNUSED(drop_source) ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - // printf( "Drag source: drag_data_delete\n" ); -} -} - -//---------------------------------------------------------------------------- -// "drag_begin" -//---------------------------------------------------------------------------- - -extern "C" { -static void source_drag_begin( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - wxDropSource *WXUNUSED(drop_source) ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - // printf( "Drag source: drag_begin.\n" ); -} -} - //---------------------------------------------------------------------------- // "drag_end" //---------------------------------------------------------------------------- @@ -715,8 +668,6 @@ static void source_drag_end( GtkWidget *WXUNUSED(widget), GdkDragContext *WXUNUSED(context), wxDropSource *drop_source ) { - if (g_isIdle) wxapp_install_idle_handler(); - // printf( "Drag source: drag_end.\n" ); drop_source->m_waiting = false; @@ -731,8 +682,6 @@ extern "C" { static gint gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source ) { - // don't need to install idle handler, its done from "event" signal - source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) ); return 0; @@ -829,7 +778,7 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context ) m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP); gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE); + gtk_widget_set_app_paintable (m_iconWindow, TRUE); gtk_widget_pop_colormap (); @@ -859,7 +808,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags) // don't start dragging if no button is down if (g_lastButtonNumber == 0) return wxDragNone; - + // we can only start a drag after a mouse event if (g_lastMouseEvent == NULL) return wxDragNone; @@ -925,10 +874,6 @@ void wxDropSource::RegisterWindow() g_signal_connect (m_widget, "drag_data_get", G_CALLBACK (source_drag_data_get), this); - g_signal_connect (m_widget, "drag_data_delete", - G_CALLBACK (source_drag_data_delete), this); - g_signal_connect (m_widget, "drag_begin", - G_CALLBACK (source_drag_begin), this); g_signal_connect (m_widget, "drag_end", G_CALLBACK (source_drag_end), this); @@ -942,12 +887,6 @@ void wxDropSource::UnregisterWindow() g_signal_handlers_disconnect_by_func (m_widget, (gpointer) source_drag_data_get, this); - g_signal_handlers_disconnect_by_func (m_widget, - (gpointer) source_drag_data_delete, - this); - g_signal_handlers_disconnect_by_func (m_widget, - (gpointer) source_drag_begin, - this); g_signal_handlers_disconnect_by_func (m_widget, (gpointer) source_drag_end, this);