// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #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
// 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<<<<t;O ",
+" e0yyrqq9642%&*=to ",
+" e00yyrqq9642%&*=o ",
+" eu0wwwwwww777<&*X ",
+" euu00yyrqq9642%&X ",
+" eiuu00yyrqq9642%X ",
+" eiiwwwwwwwwww742$ ",
+" eiiiuu00yyrqq964$ ",
+" eiiiiuu00yyrqq96$ ",
+" eiiiiiuu00yyrqq95 ",
+" eiiiiiiuu00yyrqq5 ",
+" eeeeeeeeeeeeee55e ",
+" ",
+" ",
+" ",
+" ",
+" "
+};
// ============================================================================
// ============================================================================
// ----------------------------------------------------------------------------
-// convert between GTK+ and wxWindows DND constants
+// convert between GTK+ and wxWidgets DND constants
// ----------------------------------------------------------------------------
static wxDragResult ConvertFromGTK(long action)
// "drag_leave"
// ----------------------------------------------------------------------------
+extern "C" {
static void target_drag_leave( GtkWidget *WXUNUSED(widget),
GdkDragContext *context,
guint WXUNUSED(time),
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,
// 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 ) )
{
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)
{
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,
/* 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 );
#endif
GdkAtom format = drop_target->GetMatchingPair();
- wxASSERT( format );
+
+ // this does happen somehow, see bug 555111
+ wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") )
/*
GdkDragAction action = GDK_ACTION_MOVE;
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,
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") );
- /* tell GTK that data transfer was successfull */
+ /* tell GTK that data transfer was successful */
gtk_drag_finish( context, TRUE, FALSE, time );
}
else
{
wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );
- /* 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
wxDropTarget::wxDropTarget( wxDataObject *data )
: wxDropTargetBase( data )
{
- m_firstMotion = TRUE;
+ m_firstMotion = true;
m_dragContext = (GdkDragContext*) NULL;
m_dragWidget = (GtkWidget*) NULL;
m_dragData = (GtkSelectionData*) NULL;
bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{
if (!m_dataObject)
- return FALSE;
+ return false;
return (GetMatchingPair() != (GdkAtom) 0);
}
GList *child = m_dragContext->targets;
while (child)
{
- GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
+ // in GTK+ 1.x GdkAtom was a gulong, but now it's a pointer
+ GdkAtom formatAtom =
+#ifdef __WXGTK20__
+ (GdkAtom)(child->data);
+#else
+ GPOINTER_TO_INT(child->data);
+#endif
wxDataFormat format( formatAtom );
#ifdef __WXDEBUG__
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 )
// "drag_data_get"
//----------------------------------------------------------------------------
+extern "C" {
static void
source_drag_data_get (GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context),
/* 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 */
delete[] d;
}
+}
//----------------------------------------------------------------------------
// "drag_data_delete"
//----------------------------------------------------------------------------
+extern "C" {
static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
GdkDragContext *context,
wxDropSource *WXUNUSED(drop_source) )
// printf( "Drag source: drag_data_delete\n" );
}
+}
//----------------------------------------------------------------------------
// "drag_begin"
//----------------------------------------------------------------------------
+extern "C" {
static void source_drag_begin( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context),
wxDropSource *WXUNUSED(drop_source) )
// printf( "Drag source: drag_begin.\n" );
}
+}
//----------------------------------------------------------------------------
// "drag_end"
//----------------------------------------------------------------------------
+extern "C" {
static void source_drag_end( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context),
wxDropSource *drop_source )
// 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 )
{
return 0;
}
+}
//---------------------------------------------------------------------------
// wxDropSource
const wxIcon &iconMove,
const wxIcon &iconNone)
{
- m_waiting = TRUE;
+ m_waiting = true;
m_iconWindow = (GtkWidget*) NULL;
const wxIcon &iconMove,
const wxIcon &iconNone)
{
- m_waiting = TRUE;
+ m_waiting = true;
SetData( data );
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 );
/* re-enable GUI threads */
#endif
- g_blockEventsOnDrag = FALSE;
+ g_blockEventsOnDrag = false;
UnregisterWindow();
projects / wxWidgets.git / blobdiff