#include "wx/gdicmn.h"
#endif
-#include "wx/gtk/private.h"
+#include "wx/scopeguard.h"
-#include <gdk/gdkprivate.h>
-
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkselection.h>
+#include <gtk/gtk.h>
//----------------------------------------------------------------------------
// global data
guint WXUNUSED(time),
wxDropTarget *drop_target )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
/* 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( (GdkDragContext*) NULL );
+ drop_target->GtkSetDragContext( NULL );
}
}
guint time,
wxDropTarget *drop_target )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
/* Owen Taylor: "if the coordinates not in a drop zone,
return FALSE, otherwise call gtk_drag_status() and
return TRUE" */
+#if 0
+ wxPrintf( "motion\n" );
+ GList *tmp_list;
+ for (tmp_list = context->targets; tmp_list; tmp_list = tmp_list->next)
+ {
+ wxString atom = wxString::FromAscii( gdk_atom_name (GDK_POINTER_TO_ATOM (tmp_list->data)) );
+ wxPrintf( "Atom: %s\n", atom );
+ }
+#endif
+
/* 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
if (drop_target->GetDefaultAction() == wxDragNone)
{
// use default action set by wxDropSource::DoDragDrop()
- if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
+ if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
(context->actions & GDK_ACTION_MOVE ) )
- {
- // move is requested by the program and allowed by GTK+ - do it, even
- // though suggested_action may be currently wxDragCopy
- result = wxDragMove;
- }
- else // use whatever GTK+ says we should
- {
- result = ConvertFromGTK(context->suggested_action);
-
- if ( (result == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) )
{
- // we're requested to move but we can't
- result = wxDragCopy;
+ // move is requested by the program and allowed by GTK+ - do it, even
+ // though suggested_action may be currently wxDragCopy
+ result = wxDragMove;
+ }
+ else // use whatever GTK+ says we should
+ {
+ result = ConvertFromGTK(context->suggested_action);
+
+ if ( (result == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) )
+ {
+ // we're requested to move but we can't
+ result = wxDragCopy;
+ }
}
- }
}
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( (GdkDragContext*) NULL );
+ drop_target->GtkSetDragContext( NULL );
/* this has to be done because GDK has no "drag_enter" event */
drop_target->m_firstMotion = false;
guint time,
wxDropTarget *drop_target )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
/* Owen Taylor: "if the drop is not in a drop zone,
return FALSE, otherwise, if you aren't accepting
the drop, call gtk_drag_finish() with success == FALSE
otherwise call gtk_drag_data_get()" */
-// printf( "drop.\n" );
-
/* this seems to make a difference between not accepting
due to wrong target area and due to wrong format. let
us hope that this is not required.. */
/* 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;
#ifdef __WXDEBUG__
wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );
#endif
-
+
/* cancel the whole thing */
gtk_drag_finish( context,
FALSE, /* no success */
#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?") );
}
/* after this, invalidate the drop_target's GdkDragContext */
- drop_target->SetDragContext( (GdkDragContext*) NULL );
+ drop_target->GtkSetDragContext( NULL );
/* after this, invalidate the drop_target's drag widget */
- drop_target->SetDragWidget( (GtkWidget*) NULL );
+ drop_target->GtkSetDragWidget( NULL );
/* this has to be done because GDK has no "drag_enter" event */
drop_target->m_firstMotion = true;
guint time,
wxDropTarget *drop_target )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
/* Owen Taylor: "call gtk_drag_finish() with
success == TRUE" */
#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);
#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 );
}
#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( (GtkSelectionData*) NULL );
+ drop_target->GtkSetDragData( NULL );
}
}
: wxDropTargetBase( data )
{
m_firstMotion = true;
- m_dragContext = (GdkDragContext*) NULL;
- m_dragWidget = (GtkWidget*) NULL;
- m_dragData = (GtkSelectionData*) NULL;
+ m_dragContext = NULL;
+ m_dragWidget = NULL;
+ m_dragData = NULL;
m_dragTime = 0;
}
wxLogNull noLog;
#endif // Debug
- return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone;
+ return (GtkGetMatchingPair() != (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()
{
if (!m_dataObject)
return (GdkAtom) 0;
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") );
gtk_drag_dest_set( widget,
(GtkDestDefaults) 0, /* no default behaviour */
- (GtkTargetEntry*) NULL, /* we don't supply any formats here */
+ NULL, /* we don't supply any formats here */
0, /* number of targets = 0 */
(GdkDragAction) 0 ); /* we don't supply any actions here */
guint WXUNUSED(time),
wxDropSource *drop_source )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
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;
wxDataObject *data = drop_source->GetDataObject();
}
}
-//----------------------------------------------------------------------------
-// "drag_data_delete"
-//----------------------------------------------------------------------------
-
-extern "C" {
-static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
- GdkDragContext *WXUNUSED(context),
- wxDropSource *WXUNUSED(drop_source) )
-{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
- // 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) )
-{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
- // printf( "Drag source: drag_begin.\n" );
-}
-}
-
//----------------------------------------------------------------------------
// "drag_end"
//----------------------------------------------------------------------------
GdkDragContext *WXUNUSED(context),
wxDropSource *drop_source )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
// printf( "Drag source: drag_end.\n" );
drop_source->m_waiting = false;
static gint
gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
{
- // don't need to install idle handler, its done from "event" signal
-
source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
return 0;
{
m_waiting = true;
- m_iconWindow = (GtkWidget*) NULL;
+ m_iconWindow = NULL;
m_window = win;
m_widget = win->m_widget;
SetData( data );
- m_iconWindow = (GtkWidget*) NULL;
+ m_iconWindow = NULL;
m_window = win;
m_widget = win->m_widget;
if ( icon->GetMask() )
mask = icon->GetMask()->GetBitmap();
else
- mask = (GdkBitmap *)NULL;
+ mask = NULL;
GdkPixmap *pixmap = icon->GetPixmap();
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_set_app_paintable (m_iconWindow, TRUE);
gtk_widget_pop_colormap ();
// don't start dragging if no button is down
if (g_lastButtonNumber == 0)
return wxDragNone;
-
+
// we can only start a drag after a mouse event
if (g_lastMouseEvent == NULL)
return wxDragNone;
- // disabled for now
- g_blockEventsOnDrag = true;
-
- RegisterWindow();
+ GTKConnectDragSignals();
+ wxON_BLOCK_EXIT_OBJ0(*this, wxDropSource::GTKDisconnectDragSignals);
m_waiting = true;
- GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
+ GtkTargetList *target_list = gtk_target_list_new( NULL, 0 );
wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
m_data->GetAllFormats( array );
g_lastButtonNumber, // number of mouse button which started drag
(GdkEvent*) g_lastMouseEvent );
+ if ( !context )
+ {
+ // this can happen e.g. if gdk_pointer_grab() failed
+ return wxDragError;
+ }
+
m_dragContext = context;
PrepareIcon( action, context );
if ( m_retValue == wxDragNone )
m_retValue = wxDragCancel;
- g_blockEventsOnDrag = false;
-
- UnregisterWindow();
-
return m_retValue;
}
-void wxDropSource::RegisterWindow()
+void wxDropSource::GTKConnectDragSignals()
{
- if (!m_widget) return;
+ if (!m_widget)
+ return;
+
+ g_blockEventsOnDrag = true;
g_signal_connect (m_widget, "drag_data_get",
G_CALLBACK (source_drag_data_get), this);
- g_signal_connect (m_widget, "drag_data_delete",
- G_CALLBACK (source_drag_data_delete), this);
- g_signal_connect (m_widget, "drag_begin",
- G_CALLBACK (source_drag_begin), this);
g_signal_connect (m_widget, "drag_end",
G_CALLBACK (source_drag_end), this);
}
-void wxDropSource::UnregisterWindow()
+void wxDropSource::GTKDisconnectDragSignals()
{
if (!m_widget)
return;
+ g_blockEventsOnDrag = false;
+
g_signal_handlers_disconnect_by_func (m_widget,
(gpointer) source_drag_data_get,
this);
- g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_data_delete,
- this);
- g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_begin,
- this);
g_signal_handlers_disconnect_by_func (m_widget,
(gpointer) source_drag_end,
this);
projects / wxWidgets.git / blobdiff