#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 );
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 );
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
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.. */
guint time,
wxDropTarget *drop_target )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
/* Owen Taylor: "call gtk_drag_finish() with
success == TRUE" */
guint WXUNUSED(time),
wxDropSource *drop_source )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
wxDataFormat format( selection_data->target );
#ifdef __WXDEBUG__
}
}
-//----------------------------------------------------------------------------
-// "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_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 ();
if (g_lastMouseEvent == NULL)
return wxDragNone;
- // disabled for now
- g_blockEventsOnDrag = true;
-
- RegisterWindow();
+ GTKConnectDragSignals();
+ wxON_BLOCK_EXIT_OBJ0(*this, wxDropSource::GTKDisconnectDragSignals);
m_waiting = true;
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