X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..8ca1a013e4e699724040ff1f514dab3b4a11d3c9:/src/gtk/dnd.cpp?ds=sidebyside diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 2181646be5..c995a53350 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp +// Name: src/gtk/dnd.cpp // Purpose: wxDropTarget class // Author: Robert Roebling // Id: $Id$ @@ -7,46 +7,24 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dnd.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/dnd.h" -#include "wx/log.h" - - #if wxUSE_DRAG_AND_DROP -#include "wx/window.h" -#include "wx/app.h" -#include "wx/gdicmn.h" -#include "wx/intl.h" -#include "wx/utils.h" - -#include "wx/gtk/private.h" - -#include - -#include -#include - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - -//----------------------------------------------------------------------------- -// thread system -//----------------------------------------------------------------------------- +#include "wx/dnd.h" -#if wxUSE_THREADS +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/window.h" + #include "wx/gdicmn.h" #endif +#include + //---------------------------------------------------------------------------- // global data //---------------------------------------------------------------------------- @@ -56,58 +34,97 @@ extern bool g_blockEventsOnDrag; // the flags used for the last DoDragDrop() static long gs_flagsForDrag = 0; +#ifdef __WXDEBUG__ // 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"); +#endif + +// global variables because GTK+ DnD want to have the +// mouse event that caused it +extern GdkEvent *g_lastMouseEvent; +extern int g_lastButtonNumber; //---------------------------------------------------------------------------- // standard icons //---------------------------------------------------------------------------- -/* XPM */ +/* Copyright (c) Julian Smart */ static const 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", +/* columns rows colors chars-per-pixel */ +"32 32 37 1", +"5 c #7198D9", +", c #769CDA", +"2 c #DCE6F6", +"i c #FFFFFF", +"e c #779DDB", +": c #9AB6E4", +"9 c #EAF0FA", +"- c #B1C7EB", +"$ c #6992D7", +"y c #F7F9FD", +"= c #BED0EE", +"q c #F0F5FC", +"; c #A8C0E8", +"@ c #366BC2", +" c None", +"u c #FDFEFF", +"8 c #5987D3", +"* c #C4D5F0", +"7 c #7CA0DC", +"O c #487BCE", +"< c #6B94D7", +"& c #CCDAF2", +"> c #89A9DF", +"3 c #5584D1", +"w c #82A5DE", +"1 c #3F74CB", +"+ c #3A70CA", +". c #3569BF", +"% c #D2DFF4", +"# c #3366BB", +"r c #F5F8FD", +"0 c #FAFCFE", +"4 c #DFE8F7", +"X c #5E8AD4", +"o c #5282D0", +"t c #B8CCEC", +"6 c #E5EDF9", /* pixels */ -" ................... ", -" .XXXXXXXXXXXXXXXXX.. ", -" .XXXXXXXXXXXXXXXXX.o. ", -" .XXXXXXXXXXXXXXXXX.oo. ", -" .XXXXXXXXXXXXXXXXX.ooo. ", -" .XXXXXXXXXXXXXXXXX.oooo. ", -" .XXXXXXXXXXXXXXXXX....... ", -" .XXXXXOOOOOOOOOOXXXooooo. ", -" .XXXXXXXXXXXXXXXXXXooooo. ", -" .XXXXXOOOOOOOOOOXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXOOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXOOOOOOOOOOXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXOOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXOOOOOOOOOOXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXOOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXOOOOOOOXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" ......................... "}; +" ", +" ", +" ", +" ", +" ", +" .XXXooOO++@# ", +" $%&*=-;::>,<1 ", +" $2%&*=-;::><:3 ", +" $42%&*=-;::<&:3 ", +" 56477<<<<8<<9&:X ", +" 59642%&*=-;<09&:5 ", +" 5q9642%&*=-<<<<<# ", +" 5qqw777<<<<<88:>+ ", +" erqq9642%&*=t;::+ ", +" eyrqq9642%&*=t;:O ", +" eyywwww777<<<SetDragContext( context ); @@ -155,16 +171,18 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget), drop_target->OnLeave(); /* this has to be done because GDK has no "drag_enter" event */ - drop_target->m_firstMotion = TRUE; + drop_target->m_firstMotion = true; /* after this, invalidate the drop_target's GdkDragContext */ drop_target->SetDragContext( (GdkDragContext*) NULL ); } +} // ---------------------------------------------------------------------------- // "drag_motion" // ---------------------------------------------------------------------------- +extern "C" { static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), GdkDragContext *context, gint x, @@ -172,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" */ @@ -187,6 +203,9 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), // only good if we don't have our own preferences - but also the actions // field wxDragResult result; + if (drop_target->GetDefaultAction() == wxDragNone) + { + // use default action set by wxDropSource::DoDragDrop() if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove && (context->actions & GDK_ACTION_MOVE ) ) { @@ -204,6 +223,21 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), result = wxDragCopy; } } + } + else if (drop_target->GetDefaultAction() == wxDragMove && + (context->actions & GDK_ACTION_MOVE)) + { + result = wxDragMove; + } + else + { + if (context->actions & GDK_ACTION_COPY) + result = wxDragCopy; + else if (context->actions & GDK_ACTION_MOVE) + result = wxDragMove; + else + result = wxDragNone; + } if (drop_target->m_firstMotion) { @@ -234,15 +268,17 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), drop_target->SetDragContext( (GdkDragContext*) NULL ); /* this has to be done because GDK has no "drag_enter" event */ - drop_target->m_firstMotion = FALSE; + drop_target->m_firstMotion = false; return ret; } +} // ---------------------------------------------------------------------------- // "drag_drop" // ---------------------------------------------------------------------------- +extern "C" { static gboolean target_drag_drop( GtkWidget *widget, GdkDragContext *context, gint x, @@ -250,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 @@ -283,13 +317,15 @@ static gboolean target_drag_drop( GtkWidget *widget, /* reset the block here as someone might very well show a dialog as a reaction to a drop and this wouldn't work without events */ - g_blockEventsOnDrag = FALSE; + g_blockEventsOnDrag = false; bool ret = drop_target->OnDrop( x, y ); if (!ret) { +#ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") ); +#endif /* cancel the whole thing */ gtk_drag_finish( context, @@ -299,7 +335,9 @@ static gboolean target_drag_drop( GtkWidget *widget, } else { - wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned TRUE") ); +#ifdef __WXDEBUG__ + wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") ); +#endif #if wxUSE_THREADS /* disable GUI threads */ @@ -308,7 +346,7 @@ static gboolean target_drag_drop( GtkWidget *widget, GdkAtom format = drop_target->GetMatchingPair(); // this does happen somehow, see bug 555111 - wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") ) + wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") ); /* GdkDragAction action = GDK_ACTION_MOVE; @@ -333,15 +371,17 @@ static gboolean target_drag_drop( GtkWidget *widget, drop_target->SetDragWidget( (GtkWidget*) NULL ); /* this has to be done because GDK has no "drag_enter" event */ - drop_target->m_firstMotion = TRUE; + drop_target->m_firstMotion = true; return ret; } +} // ---------------------------------------------------------------------------- // "drag_data_received" // ---------------------------------------------------------------------------- +extern "C" { static void target_drag_data_received( GtkWidget *WXUNUSED(widget), GdkDragContext *context, gint x, @@ -351,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" */ @@ -365,32 +403,39 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), return; } +#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 ); - wxDragResult result = ConvertFromGTK(context->suggested_action); + wxDragResult result = ConvertFromGTK(context->action); if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) ) { - wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") ); +#ifdef __WXDEBUG__ + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") ); +#endif - /* tell GTK that data transfer was successfull */ + /* tell GTK that data transfer was successful */ gtk_drag_finish( context, TRUE, FALSE, time ); } else { +#ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") ); +#endif - /* tell GTK that data transfer was not successfull */ + /* tell GTK that data transfer was not successful */ gtk_drag_finish( context, FALSE, FALSE, time ); } /* after this, invalidate the drop_target's drag data */ drop_target->SetDragData( (GtkSelectionData*) NULL ); } +} //---------------------------------------------------------------------------- // wxDropTarget @@ -399,7 +444,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), wxDropTarget::wxDropTarget( wxDataObject *data ) : wxDropTargetBase( data ) { - m_firstMotion = TRUE; + m_firstMotion = true; m_dragContext = (GdkDragContext*) NULL; m_dragWidget = (GtkWidget*) NULL; m_dragData = (GtkSelectionData*) NULL; @@ -424,7 +469,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) { if (!m_dataObject) - return FALSE; + return false; return (GetMatchingPair() != (GdkAtom) 0); } @@ -452,7 +497,7 @@ GdkAtom wxDropTarget::GetMatchingPair() GList *child = m_dragContext->targets; while (child) { - GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data); + GdkAtom formatAtom = (GdkAtom)(child->data); wxDataFormat format( formatAtom ); #ifdef __WXDEBUG__ @@ -472,19 +517,19 @@ GdkAtom wxDropTarget::GetMatchingPair() bool wxDropTarget::GetData() { if (!m_dragData) - return FALSE; + return false; if (!m_dataObject) - return FALSE; + return false; wxDataFormat dragFormat( m_dragData->target ); if (!m_dataObject->IsSupportedFormat( dragFormat )) - return FALSE; + return false; m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data ); - return TRUE; + return true; } void wxDropTarget::UnregisterWidget( GtkWidget *widget ) @@ -493,17 +538,14 @@ void wxDropTarget::UnregisterWidget( GtkWidget *widget ) 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 ); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_leave, this); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_motion, this); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_drop, this); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_data_received, this); } void wxDropTarget::RegisterWidget( GtkWidget *widget ) @@ -526,23 +568,24 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) 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 ); + g_signal_connect (widget, "drag_leave", + G_CALLBACK (target_drag_leave), this); - gtk_signal_connect( GTK_OBJECT(widget), "drag_motion", - GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); + g_signal_connect (widget, "drag_motion", + G_CALLBACK (target_drag_motion), this); - gtk_signal_connect( GTK_OBJECT(widget), "drag_drop", - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); + g_signal_connect (widget, "drag_drop", + G_CALLBACK (target_drag_drop), this); - gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received", - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); + g_signal_connect (widget, "drag_data_received", + G_CALLBACK (target_drag_data_received), this); } //---------------------------------------------------------------------------- // "drag_data_get" //---------------------------------------------------------------------------- +extern "C" { static void source_drag_data_get (GtkWidget *WXUNUSED(widget), GdkDragContext *WXUNUSED(context), @@ -551,12 +594,12 @@ 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; @@ -564,20 +607,26 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), if (!data) { +#ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT("Drop source: no data object") ); - return; +#endif + return; } if (!data->IsSupportedFormat(format)) { +#ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") ); - return; +#endif + return; } if (data->GetDataSize(format) == 0) { +#ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT("Drop source: empty data") ); - return; +#endif + return; } size_t size = data->GetDataSize(format); @@ -596,11 +645,11 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), /* disable GUI threads */ #endif - gtk_selection_data_set( selection_data, - selection_data->target, - 8, // 8-bit - d, - size ); + gtk_selection_data_set( selection_data, + selection_data->target, + 8, // 8-bit + d, + size ); #if wxUSE_THREADS /* enable GUI threads */ @@ -608,64 +657,36 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), delete[] d; } - -//---------------------------------------------------------------------------- -// "drag_data_delete" -//---------------------------------------------------------------------------- - -static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - wxDropSource *WXUNUSED(drop_source) ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - // printf( "Drag source: drag_data_delete\n" ); -} - -//---------------------------------------------------------------------------- -// "drag_begin" -//---------------------------------------------------------------------------- - -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" //---------------------------------------------------------------------------- +extern "C" { 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; + drop_source->m_waiting = false; +} } //----------------------------------------------------------------------------- // "configure_event" from m_iconWindow //----------------------------------------------------------------------------- +extern "C" { static gint gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source ) { - if (g_isIdle) - wxapp_install_idle_handler(); - source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) ); return 0; } +} //--------------------------------------------------------------------------- // wxDropSource @@ -676,7 +697,7 @@ wxDropSource::wxDropSource(wxWindow *win, const wxIcon &iconMove, const wxIcon &iconNone) { - m_waiting = TRUE; + m_waiting = true; m_iconWindow = (GtkWidget*) NULL; @@ -695,7 +716,7 @@ wxDropSource::wxDropSource(wxDataObject& data, const wxIcon &iconMove, const wxIcon &iconNone) { - m_waiting = TRUE; + m_waiting = true; SetData( data ); @@ -750,28 +771,22 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context ) GdkPixmap *pixmap = icon->GetPixmap(); gint width,height; - gdk_window_get_size (pixmap, &width, &height); + gdk_drawable_get_size (pixmap, &width, &height); GdkColormap *colormap = gtk_widget_get_colormap( m_widget ); -#ifndef __WXGTK20__ - gtk_widget_push_visual (gdk_colormap_get_visual (colormap)); -#endif gtk_widget_push_colormap (colormap); m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP); gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE); + gtk_widget_set_app_paintable (m_iconWindow, TRUE); -#ifndef __WXGTK20__ - gtk_widget_pop_visual (); -#endif gtk_widget_pop_colormap (); - gtk_widget_set_usize (m_iconWindow, width, height); + gtk_widget_set_size_request (m_iconWindow, width, height); gtk_widget_realize (m_iconWindow); - gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event", - GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this ); + g_signal_connect (m_iconWindow, "configure_event", + G_CALLBACK (gtk_dnd_window_configure_callback), this); gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE); @@ -790,12 +805,20 @@ wxDragResult wxDropSource::DoDragDrop(int flags) if (g_blockEventsOnDrag) return wxDragNone; + // don't start dragging if no button is down + if (g_lastButtonNumber == 0) + return wxDragNone; + + // we can only start a drag after a mouse event + if (g_lastMouseEvent == NULL) + return wxDragNone; + // disabled for now - g_blockEventsOnDrag = TRUE; + g_blockEventsOnDrag = true; RegisterWindow(); - m_waiting = TRUE; + m_waiting = true; GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 ); @@ -805,67 +828,40 @@ wxDragResult wxDropSource::DoDragDrop(int flags) for (size_t i = 0; i < count; i++) { GdkAtom atom = array[i]; +#ifdef __WXDEBUG__ wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom )); - gtk_target_list_add( target_list, atom, 0, 0 ); +#endif + gtk_target_list_add( target_list, atom, 0, 0 ); } delete[] array; - 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 = (guint32)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; + int action = GDK_ACTION_COPY; + if ( flags & wxDrag_AllowMove ) + action |= GDK_ACTION_MOVE; -#if wxUSE_THREADS - /* disable GUI threads */ -#endif - - /* don't start dragging if no button is down */ - if (button_number) - { - int action = GDK_ACTION_COPY; - if ( flags & wxDrag_AllowMove ) - action |= GDK_ACTION_MOVE; - - // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad - // to use a global to pass the flags to the drop target but I'd - // surely prefer a better way to do it - gs_flagsForDrag = flags; + // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad + // to use a global to pass the flags to the drop target but I'd + // surely prefer a better way to do it + gs_flagsForDrag = flags; - GdkDragContext *context = gtk_drag_begin( m_widget, + GdkDragContext *context = gtk_drag_begin( m_widget, target_list, (GdkDragAction)action, - button_number, /* number of mouse button which started drag */ - (GdkEvent*) &event ); + g_lastButtonNumber, // number of mouse button which started drag + (GdkEvent*) g_lastMouseEvent ); - m_dragContext = context; + m_dragContext = context; - PrepareIcon( action, context ); + PrepareIcon( action, context ); - while (m_waiting) - gtk_main_iteration(); + while (m_waiting) + gtk_main_iteration(); - m_retValue = ConvertFromGTK(context->action); - if ( m_retValue == wxDragNone ) - m_retValue = wxDragCancel; - } - -#if wxUSE_THREADS - /* re-enable GUI threads */ -#endif + m_retValue = ConvertFromGTK(context->action); + if ( m_retValue == wxDragNone ) + m_retValue = wxDragCancel; - g_blockEventsOnDrag = FALSE; + g_blockEventsOnDrag = false; UnregisterWindow(); @@ -876,29 +872,24 @@ void wxDropSource::RegisterWindow() { 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 ); + g_signal_connect (m_widget, "drag_data_get", + G_CALLBACK (source_drag_data_get), this); + g_signal_connect (m_widget, "drag_end", + G_CALLBACK (source_drag_end), this); } void wxDropSource::UnregisterWindow() { - if (!m_widget) return; + 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 ); + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) source_drag_data_get, + this); + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) source_drag_end, + this); } #endif