// 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
+#define TRACE_DND "dnd"
// global variables because GTK+ DnD want to have the
// mouse event that caused it
{
/* inform the wxDropTarget about the current GdkDragContext.
this is only valid for the duration of this call */
- drop_target->SetDragContext( context );
+ drop_target->GtkSetDragContext( context );
/* we don't need return values. this event is just for
information */
drop_target->m_firstMotion = true;
/* after this, invalidate the drop_target's GdkDragContext */
- drop_target->SetDragContext( NULL );
+ drop_target->GtkSetDragContext( NULL );
}
}
/* inform the wxDropTarget about the current GdkDragContext.
this is only valid for the duration of this call */
- drop_target->SetDragContext( context );
+ drop_target->GtkSetDragContext( context );
// GTK+ always supposes that we want to copy the data by default while we
// might want to move it, so examine not only suggested_action - which is
else if (drop_target->GetDefaultAction() == wxDragMove &&
(context->actions & GDK_ACTION_MOVE))
{
-
+
result = wxDragMove;
}
else
}
/* after this, invalidate the drop_target's GdkDragContext */
- drop_target->SetDragContext( NULL );
+ drop_target->GtkSetDragContext( NULL );
/* this has to be done because GDK has no "drag_enter" event */
drop_target->m_firstMotion = false;
/* inform the wxDropTarget about the current GdkDragContext.
this is only valid for the duration of this call */
- drop_target->SetDragContext( context );
+ drop_target->GtkSetDragContext( context );
/* inform the wxDropTarget about the current drag widget.
this is only valid for the duration of this call */
- drop_target->SetDragWidget( widget );
+ drop_target->GtkSetDragWidget( widget );
/* inform the wxDropTarget about the current drag time.
this is only valid for the duration of this call */
- drop_target->SetDragTime( time );
+ drop_target->GtkSetDragTime( time );
/*
wxDragResult result = wxDragMove;
if (!ret)
{
-#ifdef __WXDEBUG__
wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );
-#endif
/* cancel the whole thing */
gtk_drag_finish( context,
}
else
{
-#ifdef __WXDEBUG__
wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") );
-#endif
#if wxUSE_THREADS
/* disable GUI threads */
#endif
- GdkAtom format = drop_target->GetMatchingPair();
+ GdkAtom format = drop_target->GtkGetMatchingPair();
// this does happen somehow, see bug 555111
- wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") );
+ wxCHECK_MSG( format, FALSE, wxT("no matching GdkAtom for format?") );
/*
GdkDragAction action = GDK_ACTION_MOVE;
}
/* after this, invalidate the drop_target's GdkDragContext */
- drop_target->SetDragContext( NULL );
+ drop_target->GtkSetDragContext( NULL );
/* after this, invalidate the drop_target's drag widget */
- drop_target->SetDragWidget( NULL );
+ drop_target->GtkSetDragWidget( NULL );
/* this has to be done because GDK has no "drag_enter" event */
drop_target->m_firstMotion = true;
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 );
+ drop_target->GtkSetDragData( data );
wxDragResult result = ConvertFromGTK(context->action);
if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
{
-#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 );
}
else
{
-#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 );
}
/* after this, invalidate the drop_target's drag data */
- drop_target->SetDragData( NULL );
+ drop_target->GtkSetDragData( NULL );
}
}
{
// GetMatchingPair() checks for m_dataObject too, no need to do it here
- // disable the debug message from GetMatchingPair() - there are too many
- // of them otherwise
-#ifdef __WXDEBUG__
- wxLogNull noLog;
-#endif // Debug
-
- return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;
+ // disable the trace message from GetMatchingPair() by passing true to it
+ // (there are just too many of them otherwise)
+ return (GtkGetMatchingPair(true) != (GdkAtom) 0) ? def : wxDragNone;
}
bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
if (!m_dataObject)
return false;
- return (GetMatchingPair() != (GdkAtom) 0);
+ return (GtkGetMatchingPair() != (GdkAtom) 0);
}
wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
if (!m_dataObject)
return wxDragNone;
- if (GetMatchingPair() == (GdkAtom) 0)
+ if (GtkGetMatchingPair() == (GdkAtom) 0)
return wxDragNone;
return GetData() ? def : wxDragNone;
}
-GdkAtom wxDropTarget::GetMatchingPair()
+
+wxDataFormat wxDropTarget::GetMatchingPair()
+{
+ return wxDataFormat( GtkGetMatchingPair() );
+}
+
+GdkAtom wxDropTarget::GtkGetMatchingPair(bool quiet)
{
if (!m_dataObject)
return (GdkAtom) 0;
GdkAtom formatAtom = (GdkAtom)(child->data);
wxDataFormat format( formatAtom );
-#ifdef __WXDEBUG__
- wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"),
- format.GetId().c_str());
-#endif // Debug
+ if ( !quiet )
+ {
+ wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"),
+ format.GetId().c_str());
+ }
if (m_dataObject->IsSupportedFormat( format ))
return formatAtom;
return true;
}
-void wxDropTarget::UnregisterWidget( GtkWidget *widget )
+void wxDropTarget::GtkUnregisterWidget( GtkWidget *widget )
{
wxCHECK_RET( widget != NULL, wxT("unregister widget is NULL") );
(gpointer) target_drag_data_received, this);
}
-void wxDropTarget::RegisterWidget( GtkWidget *widget )
+void wxDropTarget::GtkRegisterWidget( GtkWidget *widget )
{
wxCHECK_RET( widget != NULL, wxT("register widget is NULL") );
{
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;
if (!data)
{
-#ifdef __WXDEBUG__
wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );
-#endif
- return;
+ return;
}
if (!data->IsSupportedFormat(format))
{
-#ifdef __WXDEBUG__
wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );
-#endif
- return;
+ return;
}
if (data->GetDataSize(format) == 0)
{
-#ifdef __WXDEBUG__
wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );
-#endif
- return;
+ return;
}
size_t size = data->GetDataSize(format);
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 ));
-#endif
- gtk_target_list_add( target_list, atom, 0, 0 );
+ wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"),
+ gdk_atom_name( atom ));
+ gtk_target_list_add( target_list, atom, 0, 0 );
}
delete[] array;
projects / wxWidgets.git / blobdiff