X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3e7d24d21f5371c88caffe4a85c8e4a5362db3f..f59ba38691a891db142ca65d976d2521bae70158:/src/gtk1/dnd.cpp?ds=sidebyside diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index d8ba14eba0..f1b6bf43e6 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -21,12 +21,12 @@ #include "wx/intl.h" #include "wx/utils.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkprivate.h" +#include +#include +#include -#include "gtk/gtkdnd.h" -#include "gtk/gtkselection.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -54,47 +54,6 @@ extern bool g_blockEventsOnDrag; // standard icons //---------------------------------------------------------------------------- -/* XPM */ -static char * gv_xpm[] = { -"40 34 3 1", -" s None c None", -". c black", -"X c white", -" ", -" ", -" ...... ", -" ..XXXXXX.. ", -" .XXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXX. ", -" .XXX..XXXX..XXX. ", -" ....XX....XX....XX. ", -" .XXX.XXX..XXXX..XXX.... ", -" .XXXXXXXXXXXXXXXXXXX.XXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXX. ", -" ..XXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXX... ", -" ..XXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXX.XXXXXXX. ", -" .XXXXXXX.XXXXXXX.XXXXXXX. ", -" .XXXXXXXX.XXXXXXX.XXXXXXX. ", -" .XXXXXXX...XXXXX...XXXXX. ", -" .XXXXXXX. ..... ..... ", -" ..XXXX.. ", -" .... ", -" ", -" ", -" "}; - /* XPM */ static char * page_xpm[] = { /* width height ncolors chars_per_pixel */ @@ -188,20 +147,34 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), this is only valid for the duration of this call */ drop_target->SetDragContext( context ); + wxDragResult result; + if ( context->suggested_action == GDK_ACTION_COPY ) + result = wxDragCopy; + else + result = wxDragMove; + if (drop_target->m_firstMotion) { /* the first "drag_motion" event substitutes a "drag_enter" event */ - drop_target->OnEnter(); + result = drop_target->OnEnter( x, y, result ); + } + else + { + /* give program a chance to react (i.e. to say no by returning FALSE) */ + result = drop_target->OnDragOver( x, y, result ); } - /* 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. */ + bool ret = wxIsDragResultOk( result ); if (ret) - gdk_drag_status( context, context->suggested_action, time ); + { + GdkDragAction action; + if (result == wxDragCopy) + action = GDK_ACTION_COPY; + else + action = GDK_ACTION_MOVE; + + gdk_drag_status( context, action, time ); + } /* after this, invalidate the drop_target's GdkDragContext */ drop_target->SetDragContext( (GdkDragContext*) NULL ); @@ -248,16 +221,51 @@ static gboolean target_drag_drop( GtkWidget *widget, this is only valid for the duration of this call */ drop_target->SetDragTime( time ); +/* + wxDragResult result = wxDragMove; + if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy; +*/ + bool ret = drop_target->OnDrop( x, y ); if (!ret) { + wxLogDebug( wxT( "Drop target: OnDrop returned FALSE") ); + /* cancel the whole thing */ gtk_drag_finish( context, FALSE, /* no success */ FALSE, /* don't delete data on dropping side */ time ); } + else + { + wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") ); + +#if wxUSE_THREADS + /* disable GUI threads */ + wxapp_uninstall_thread_wakeup(); +#endif + + GdkAtom format = drop_target->GetMatchingPair(); + wxASSERT( format ); + +/* + GdkDragAction action = GDK_ACTION_MOVE; + if (result == wxDragCopy) action == GDK_ACTION_COPY; + context->action = action; +*/ + /* this should trigger an "drag_data_received" event */ + gtk_drag_get_data( widget, + context, + format, + time ); + +#if wxUSE_THREADS + /* re-enable GUI threads */ + wxapp_install_thread_wakeup(); +#endif + } /* after this, invalidate the drop_target's GdkDragContext */ drop_target->SetDragContext( (GdkDragContext*) NULL ); @@ -289,7 +297,6 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), /* Owen Taylor: "call gtk_drag_finish() with success == TRUE" */ - if ((data->length <= 0) || (data->format != 8)) { /* negative data length and non 8-bit data format @@ -299,19 +306,29 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), return; } - wxLogDebug( wxT( "Drop target: data received") ); - + wxLogDebug( wxT( "Drop target: data received event") ); + /* 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 )) + wxDragResult result; + if ( context->suggested_action == GDK_ACTION_COPY ) + result = wxDragCopy; + else + result = wxDragMove; + + if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) ) { + wxLogDebug( 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") ); + /* tell GTK that data transfer was not successfull */ gtk_drag_finish( context, FALSE, FALSE, time ); } @@ -324,7 +341,8 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), // wxDropTarget //---------------------------------------------------------------------------- -wxDropTarget::wxDropTarget() +wxDropTarget::wxDropTarget( wxDataObject *data ) + : wxDropTargetBase( data ) { m_firstMotion = TRUE; m_dragContext = (GdkDragContext*) NULL; @@ -333,126 +351,82 @@ wxDropTarget::wxDropTarget() m_dragTime = 0; } -wxDropTarget::~wxDropTarget() +wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), + wxCoord WXUNUSED(y), + wxDragResult def ) { -} - -void wxDropTarget::OnEnter() -{ -} + // GetMatchingPair() checks for m_dataObject too, no need to do it here -void wxDropTarget::OnLeave() -{ -} + // disable the debug message from GetMatchingPair() - there are too many + // of them otherwise +#ifdef __WXDEBUG__ + wxLogNull noLog; +#endif // Debug -bool wxDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) -{ - if (GetFormatCount() == 0) - return FALSE; - - for (size_t i = 0; i < GetFormatCount(); i++) - { - if (IsSupported( GetFormat(i) )) - return TRUE; - } - - return FALSE; + return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone; } -bool wxDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) ) +bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) { - if (GetFormatCount() == 0) + if (!m_dataObject) return FALSE; - - for (size_t i = 0; i < GetFormatCount(); i++) - { - if (IsSupported( GetFormat(i) )) - { - RequestData( GetFormat(i) ); - return TRUE; - } - } - - return FALSE; -} -bool wxDropTarget::OnData( long WXUNUSED(x), long WXUNUSED(y) ) -{ - return FALSE; + return (GetMatchingPair() != (GdkAtom) 0); } -bool wxDropTarget::RequestData( wxDataFormat format ) +wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), + wxDragResult def ) { - if (!m_dragContext) return FALSE; - if (!m_dragWidget) return FALSE; - -/* - wxPrintf( wxT("format: %s.\n"), format.GetId().c_str() ); - if (format.GetType() == wxDF_PRIVATE) wxPrintf( wxT("private data.\n") ); - if (format.GetType() == wxDF_TEXT) wxPrintf( wxT("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, - m_dragTime ); + if (!m_dataObject) + return wxDragNone; -#if wxUSE_THREADS - /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); -#endif + if (GetMatchingPair() == (GdkAtom) 0) + return wxDragNone; - return TRUE; + return GetData() ? def : wxDragNone; } -bool wxDropTarget::IsSupported( wxDataFormat format ) +GdkAtom wxDropTarget::GetMatchingPair() { - if (!m_dragContext) return FALSE; + if (!m_dataObject) + return (GdkAtom) 0; + + if (!m_dragContext) + return (GdkAtom) 0; GList *child = m_dragContext->targets; while (child) { GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data); + wxDataFormat format( formatAtom ); #ifdef __WXDEBUG__ - char *name = gdk_atom_name( formatAtom ); - if (name) wxLogDebug( "Drop target: drag has format: %s", name ); -#endif + wxLogDebug( wxT("Drop target: drag has format: %s"), format.GetId().c_str() ); +#endif // Debug + + if (m_dataObject->IsSupportedFormat( format )) + return formatAtom; - if (formatAtom == format) return TRUE; child = child->next; } - return FALSE; + return (GdkAtom) 0; } -bool wxDropTarget::GetData( wxDataObject *data_object ) +bool wxDropTarget::GetData() { - if (!m_dragData) return FALSE; + if (!m_dragData) + return FALSE; - if (m_dragData->target != data_object->GetFormat()) return FALSE; + if (!m_dataObject) + return FALSE; - if (data_object->GetFormat().GetType() == wxDF_TEXT) - { - wxTextDataObject *text_object = (wxTextDataObject*)data_object; - text_object->SetText( (const char*)m_dragData->data ); - } else + wxDataFormat dragFormat( m_dragData->target ); - if (data_object->GetFormat().GetType() == wxDF_FILENAME) - { - } else + if (!m_dataObject->IsSupportedFormat( dragFormat )) + return FALSE; - 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 ); - } + m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data ); return TRUE; } @@ -509,107 +483,13 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); } -//------------------------------------------------------------------------- -// wxTextDropTarget -//------------------------------------------------------------------------- - -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(); -} - -wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id ) -{ - m_id = id; -} - -bool wxPrivateDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) ) -{ - return IsSupported( m_id ); -} - -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; -} -*/ - -//---------------------------------------------------------------------------- -// A drop target which accepts files (dragged from File Manager or Explorer) -//---------------------------------------------------------------------------- - -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; - 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 FALSE; - - wxChar **files = new wxChar*[number]; - - text = WXSTRINGCAST data.GetFiles(); - for (i = 0; i < number; i++) - { - files[i] = text; - int len = wxStrlen( text ); - text += len+1; - } - - OnDropFiles( x, y, number, files ); - - free( files ); - - return TRUE; -} - //---------------------------------------------------------------------------- // "drag_data_get" //---------------------------------------------------------------------------- static void source_drag_data_get (GtkWidget *WXUNUSED(widget), - GdkDragContext *context, + GdkDragContext *WXUNUSED(context), GtkSelectionData *selection_data, guint WXUNUSED(info), guint WXUNUSED(time), @@ -617,34 +497,42 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), { if (g_isIdle) wxapp_install_idle_handler(); -#ifdef __WXDEBUG__ - char *name = gdk_atom_name( selection_data->target ); - if (name) wxLogDebug( wxT("Drop source: format requested: %s"), name ); -#endif + wxDataFormat format( selection_data->target ); - drop_source->m_retValue = wxDragCancel; + wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() ); - wxDataObject *data = drop_source->m_data; + drop_source->m_retValue = wxDragCancel; + + wxDataObject *data = drop_source->GetDataObject(); if (!data) - return; + { + wxLogDebug( wxT("Drop source: no data object") ); + return; + } - if (!data->IsSupportedFormat(selection_data->target)) - return; + if (!data->IsSupportedFormat(format)) + { + wxLogDebug( wxT("Drop source: unsupported format") ); + return; + } - if (data->GetDataSize(selection_data->target) == 0) - return; - - size_t size = data->GetDataSize(selection_data->target); + if (data->GetDataSize(format) == 0) + { + wxLogDebug( wxT("Drop source: empty data") ); + return; + } + + size_t size = data->GetDataSize(format); // printf( "data size: %d.\n", (int)data_size ); guchar *d = new guchar[size]; - - if (!data->GetDataHere( selection_data->target, (void*)d )) + + if (!data->GetDataHere( format, (void*)d )) { - free( d ); - return; + delete[] d; + return; } #if wxUSE_THREADS @@ -663,10 +551,7 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), wxapp_install_thread_wakeup(); #endif - free( d ); - - /* so far only copy, no moves. TODO. */ - drop_source->m_retValue = wxDragCopy; + delete[] d; } //---------------------------------------------------------------------------- @@ -675,13 +560,12 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), GdkDragContext *WXUNUSED(context), - wxDropSource *drop_source ) + wxDropSource *WXUNUSED(drop_source) ) { - if (g_isIdle) wxapp_install_idle_handler(); - -// printf( "Delete the data!\n" ); + if (g_isIdle) + wxapp_install_idle_handler(); - drop_source->m_retValue = wxDragMove; + // printf( "Drag source: drag_data_delete\n" ); } //---------------------------------------------------------------------------- @@ -692,9 +576,10 @@ static void source_drag_begin( GtkWidget *WXUNUSED(widget), GdkDragContext *WXUNUSED(context), wxDropSource *WXUNUSED(drop_source) ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); -// printf( "drag_begin.\n" ); + // printf( "Drag source: drag_begin.\n" ); } //---------------------------------------------------------------------------- @@ -707,83 +592,116 @@ static void source_drag_end( GtkWidget *WXUNUSED(widget), { if (g_isIdle) wxapp_install_idle_handler(); -// printf( "drag_end.\n" ); + // printf( "Drag source: drag_end.\n" ); drop_source->m_waiting = FALSE; } +//----------------------------------------------------------------------------- +// "configure_event" from m_iconWindow +//----------------------------------------------------------------------------- + +static gint +gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + wxDragResult action = wxDragNone; + if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy; + if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove; + + source->GiveFeedback( action ); + + return 0; +} + //--------------------------------------------------------------------------- // wxDropSource //--------------------------------------------------------------------------- -wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop ) +wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon ) { - g_blockEventsOnDrag = TRUE; m_waiting = TRUE; + m_iconWindow = (GtkWidget*) NULL; + 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 ); - - m_goIcon = go; - if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm ); - m_stopIcon = stop; - if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm ); + m_icon = icon; + if (wxNullIcon == icon) m_icon = wxIcon( page_xpm ); } -wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, - const wxIcon &go, const wxIcon &stop ) +wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &icon ) { m_waiting = TRUE; + SetData( data ); + + m_iconWindow = (GtkWidget*) NULL; + 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 ); + m_retValue = wxDragCancel; - m_goIcon = go; - if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm ); - m_stopIcon = stop; - if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm ); + m_icon = icon; + if (wxNullIcon == icon) m_icon = wxIcon( page_xpm ); } -void wxDropSource::SetData( wxDataObject& data ) +wxDropSource::~wxDropSource() { - if (m_data) - delete m_data; - - m_data = &data; } -wxDropSource::~wxDropSource() +void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context ) { - if (m_data) -// delete m_data; + GdkBitmap *mask = (GdkBitmap *) NULL; + if (m_icon.GetMask()) mask = m_icon.GetMask()->GetBitmap(); + GdkPixmap *pixmap = m_icon.GetPixmap(); - g_blockEventsOnDrag = FALSE; + gint width,height; + gdk_window_get_size (pixmap, &width, &height); + + GdkColormap *colormap = gtk_widget_get_colormap( m_widget ); + gtk_widget_push_visual (gdk_colormap_get_visual (colormap)); + 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_pop_visual (); + gtk_widget_pop_colormap (); + + gtk_widget_set_usize (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 ); + + gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE); + + if (mask) + gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0); + + gtk_drag_set_icon_widget( context, m_iconWindow, hot_x, hot_y ); } -wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) +wxDragResult wxDropSource::DoDragDrop( bool allowMove ) { - wxASSERT_MSG( m_data, wxT("wxDragSource: no data") ); + wxASSERT_MSG( m_data, wxT("Drop source: no data") ); - if (!m_data) + if (!m_data) return (wxDragResult) wxDragNone; - if (m_data->GetFormatCount() == 0) + if (m_data->GetFormatCount() == 0) return (wxDragResult) wxDragNone; - + g_blockEventsOnDrag = TRUE; RegisterWindow(); @@ -791,13 +709,13 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) m_waiting = TRUE; GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 ); - + wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; - m_data->GetAllFormats( array, TRUE ); + m_data->GetAllFormats( array ); for (size_t i = 0; i < m_data->GetFormatCount(); i++) { GdkAtom atom = array[i]; - wxLogDebug( wxT("Supported atom %s"), gdk_atom_name( atom ) ); + wxLogDebug( wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ) ); gtk_target_list_add( target_list, atom, 0, 0 ); } delete[] array; @@ -811,7 +729,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) event.x = x; event.y = y; event.state = state; - event.time = GDK_CURRENT_TIME; + event.time = (guint32)GDK_CURRENT_TIME; /* GTK wants to know which button was pressed which caused the dragging */ int button_number = 0; @@ -827,25 +745,24 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) /* 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); GdkDragContext *context = gtk_drag_begin( m_widget, target_list, - GDK_ACTION_COPY, + action, 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(); + m_dragContext = context; - gtk_drag_set_icon_pixmap( context, - gtk_widget_get_colormap( m_widget ), - pm, - bm, - 0, - 0 ); + PrepareIcon( 0, 0, context ); - while (m_waiting) gtk_main_iteration();; + while (m_waiting) gtk_main_iteration(); + + if (context->action == GDK_ACTION_COPY) + m_retValue = wxDragCopy; + if (context->action == GDK_ACTION_MOVE) + m_retValue = wxDragMove; } #if wxUSE_THREADS @@ -863,7 +780,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) 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", @@ -890,5 +807,4 @@ void wxDropSource::UnregisterWindow() } #endif - // wxUSE_DRAG_AND_DROP