Revert "Correctly detect cancelled drag-and-drop operations in wxGTK."

This reverts r75745 (and r75749 fixing a minor problem in it) as this change
broke the reporting of the result of the drag and drop operation instead of
fixing it.

See #15930.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-06-02 00:16:13 +00:00
parent cc85c02fa5
commit 1467e6c5df
2 changed files with 0 additions and 18 deletions

View File

@ -61,7 +61,6 @@ All (GUI):
wxGTK:
- Support building wxGTK3 under Windows (Kolya Kosenko).
- Correctly detect cancelled drag-and-drop operations (Kinaou Hervé).
wxMSW:

View File

@ -311,9 +311,6 @@ static gboolean target_drag_drop( GtkWidget *widget,
{
wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );
// change drag and drop status if drop operation failed
gdk_drag_status( context, (GdkDragAction)0, time );
/* cancel the whole thing */
gtk_drag_finish( context,
FALSE, /* no success */
@ -368,9 +365,6 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
if (gtk_selection_data_get_length(data) <= 0 || gtk_selection_data_get_format(data) != 8)
{
// change drag and drop status if drop operation failed
gdk_drag_status( context, (GdkDragAction)0, time );
/* negative data length and non 8-bit data format
qualifies for junk */
gtk_drag_finish (context, FALSE, FALSE, time);
@ -390,9 +384,6 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
{
wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") );
// change drag and drop status if drop operation failed
gdk_drag_status( context, (GdkDragAction)0, time );
/* tell GTK that data transfer was successful */
gtk_drag_finish( context, TRUE, FALSE, time );
}
@ -889,14 +880,6 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
while (m_waiting)
gtk_main_iteration();
if ( m_retValue != wxDragCancel &&
m_retValue != wxDragError )
{
// if wxDropTarget::OnDrop has been processed and has succeeded
// check the return value of wxDropTarget::OnData
m_retValue = ConvertFromGTK(gdk_drag_context_get_selected_action(context));
}
g_signal_handlers_disconnect_by_func (m_iconWindow,
(gpointer) gtk_dnd_window_configure_callback, this);