X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ee9d6182c9b7774477e97f4326766ac05cc70c2..8aaef28406647d6aa706c34f57dd151f00b18e5b:/src/gtk/dnd.cpp diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 6ab59511ca..fdd1f25e8f 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -378,10 +378,10 @@ wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def ) { if (!m_dataObject) - return FALSE; + return wxDragNone; if (GetMatchingPair() == (GdkAtom) 0) - return FALSE; + return wxDragNone; return GetData() ? def : wxDragNone; } @@ -401,8 +401,7 @@ GdkAtom wxDropTarget::GetMatchingPair() wxDataFormat format( formatAtom ); #ifdef __WXDEBUG__ - char *name = gdk_atom_name( formatAtom ); - wxLogDebug("Drop target: drag has format: %s", name ? name : "unnamed"); + wxLogDebug("Drop target: drag has format: %s", format.GetId().c_str() ); #endif // Debug if (m_dataObject->IsSupportedFormat( format )) @@ -629,7 +628,7 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy; if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove; - source->GiveFeedback( action, FALSE ); + source->GiveFeedback( action ); return 0; }