diff options
author | Matthias Clasen <mclasen@redhat.com> | 2018-07-05 06:18:16 +0200 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2018-07-07 17:28:23 +0200 |
commit | a122316f342d5aee57e44b1e4ce5196b12739482 (patch) | |
tree | 8172742e026b29568a763be022ff06ff85ca062f | |
parent | c544dec3b9e5dc0624da7f6a42b874eec1b63f53 (diff) | |
download | gtk+-dnd-cleanups.tar.gz |
dnd: Drop gdk_drag_abortdnd-cleanups
This function is never called, so drop it, its vfunc,
and all the backend implementations.
-rw-r--r-- | gdk/broadway/gdkdnd-broadway.c | 8 | ||||
-rw-r--r-- | gdk/gdkdrag.c | 18 | ||||
-rw-r--r-- | gdk/gdkdragprivate.h | 4 | ||||
-rw-r--r-- | gdk/wayland/gdkdrag-wayland.c | 7 | ||||
-rw-r--r-- | gdk/win32/gdkdrag-win32.c | 26 | ||||
-rw-r--r-- | gdk/x11/gdkdnd-x11.c | 10 |
6 files changed, 0 insertions, 73 deletions
diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c index 1db76f43d3..e17f705f1e 100644 --- a/gdk/broadway/gdkdnd-broadway.c +++ b/gdk/broadway/gdkdnd-broadway.c @@ -111,13 +111,6 @@ gdk_broadway_drag_drag_drop (GdkDrag *context, g_return_if_fail (context != NULL); } -static void -gdk_broadway_drag_drag_abort (GdkDrag *context, - guint32 time) -{ - g_return_if_fail (context != NULL); -} - void _gdk_broadway_surface_register_dnd (GdkSurface *surface) { @@ -136,6 +129,5 @@ gdk_broadway_drag_class_init (GdkBroadwayDragClass *klass) object_class->finalize = gdk_broadway_drag_finalize; - context_class->drag_abort = gdk_broadway_drag_drag_abort; context_class->drag_drop = gdk_broadway_drag_drag_drop; } diff --git a/gdk/gdkdrag.c b/gdk/gdkdrag.c index 58878c9076..fa5fd73a8f 100644 --- a/gdk/gdkdrag.c +++ b/gdk/gdkdrag.c @@ -437,24 +437,6 @@ gdk_drag_class_init (GdkDragClass *klass) } /* - * gdk_drag_abort: - * @drag: a #GdkDrag - * @time_: the timestamp for this operation - * - * Aborts a drag without dropping. - * - * This function is called by the drag source. - */ -void -gdk_drag_abort (GdkDrag *drag, - guint32 time_) -{ - g_return_if_fail (GDK_IS_DRAG (drag)); - - GDK_DRAG_GET_CLASS (drag)->drag_abort (drag, time_); -} - -/* * gdk_drag_drop: * @drag: a #GdkDrag * @time_: the timestamp for this operation diff --git a/gdk/gdkdragprivate.h b/gdk/gdkdragprivate.h index 8aa3f9bf70..665f8452e5 100644 --- a/gdk/gdkdragprivate.h +++ b/gdk/gdkdragprivate.h @@ -33,8 +33,6 @@ typedef struct _GdkDragClass GdkDragClass; struct _GdkDragClass { GObjectClass parent_class; - void (*drag_abort) (GdkDrag *drag, - guint32 time_); void (*drag_drop) (GdkDrag *drag, guint32 time_); GdkSurface* (*get_drag_surface) (GdkDrag *drag); @@ -87,8 +85,6 @@ gboolean gdk_drag_handle_source_event (GdkEvent *event); GdkCursor * gdk_drag_get_cursor (GdkDrag *drag, GdkDragAction action); -void gdk_drag_abort (GdkDrag *drag, - guint32 time_); void gdk_drag_drop (GdkDrag *drag, guint32 time_); diff --git a/gdk/wayland/gdkdrag-wayland.c b/gdk/wayland/gdkdrag-wayland.c index a20b882dbe..6ab99d77ba 100644 --- a/gdk/wayland/gdkdrag-wayland.c +++ b/gdk/wayland/gdkdrag-wayland.c @@ -105,12 +105,6 @@ gdk_to_wl_actions (GdkDragAction action) } static void -gdk_wayland_drag_drag_abort (GdkDrag *drag, - guint32 time) -{ -} - -static void gdk_wayland_drag_drag_drop (GdkDrag *drag, guint32 time) { @@ -202,7 +196,6 @@ gdk_wayland_drag_class_init (GdkWaylandDragClass *klass) object_class->finalize = gdk_wayland_drag_finalize; - drag_class->drag_abort = gdk_wayland_drag_drag_abort; drag_class->drag_drop = gdk_wayland_drag_drag_drop; drag_class->get_drag_surface = gdk_wayland_drag_get_drag_surface; drag_class->set_hotspot = gdk_wayland_drag_set_hotspot; diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index 7a9591c967..82a653df1a 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -2029,31 +2029,6 @@ gdk_win32_drag_drop (GdkDrag *drag, } static void -gdk_win32_drag_abort (GdkDrag *drag, - guint32 time_) -{ - GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag); - GdkWin32Clipdrop *clipdrop = _gdk_win32_clipdrop_get (); - - g_assert (_win32_main_thread == NULL || - _win32_main_thread == g_thread_self ()); - - g_return_if_fail (drag != NULL); - - GDK_NOTE (DND, g_print ("gdk_win32_drag_abort\n")); - - if (drag_win32->protocol == GDK_DRAG_PROTO_OLE2) - { - gpointer ddd = g_hash_table_lookup (clipdrop->active_source_drags, drag); - - drag_win32->util_data.state = GDK_WIN32_DND_NONE; - - if (ddd) - send_source_state_update (clipdrop, drag_win32, ddd); - } -} - -static void gdk_win32_drag_set_cursor (GdkDrag *drag, GdkCursor *cursor) { @@ -2589,7 +2564,6 @@ gdk_win32_drag_class_init (GdkWin32DragClass *klass) object_class->finalize = gdk_win32_drag_finalize; - drag_class->drag_abort = gdk_win32_drag_abort; drag_class->drag_drop = gdk_win32_drag_drop; drag_class->get_drag_surface = gdk_win32_drag_get_drag_surface; diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index f42b133fa0..81b8db655c 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -196,8 +196,6 @@ static gboolean gdk_x11_drag_drag_motion (GdkDrag *drag, GdkDragAction suggested_action, GdkDragAction possible_actions, guint32 time); -static void gdk_x11_drag_drag_abort (GdkDrag *drag, - guint32 time_); static void gdk_x11_drag_drag_drop (GdkDrag *drag, guint32 time_); static GdkSurface * gdk_x11_drag_get_drag_surface (GdkDrag *drag); @@ -221,7 +219,6 @@ gdk_x11_drag_class_init (GdkX11DragClass *klass) object_class->finalize = gdk_x11_drag_finalize; - drag_class->drag_abort = gdk_x11_drag_drag_abort; drag_class->drag_drop = gdk_x11_drag_drag_drop; drag_class->get_drag_surface = gdk_x11_drag_get_drag_surface; drag_class->set_hotspot = gdk_x11_drag_set_hotspot; @@ -1603,13 +1600,6 @@ gdk_x11_drag_drag_motion (GdkDrag *drag, } static void -gdk_x11_drag_drag_abort (GdkDrag *drag, - guint32 time) -{ - gdk_drag_do_leave (GDK_X11_DRAG (drag), time); -} - -static void gdk_x11_drag_drag_drop (GdkDrag *drag, guint32 time) { |