diff options
| -rw-r--r-- | gdk/broadway/gdkdnd-broadway.c | 9 | ||||
| -rw-r--r-- | gdk/gdkdrag.c | 18 | ||||
| -rw-r--r-- | gdk/gdkdragprivate.h | 5 | ||||
| -rw-r--r-- | gdk/wayland/gdkdrag-wayland.c | 7 | ||||
| -rw-r--r-- | gdk/win32/gdkdrag-win32.c | 5 | ||||
| -rw-r--r-- | gdk/x11/gdkdnd-x11.c | 9 |
6 files changed, 6 insertions, 47 deletions
diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c index e17f705f1e..1305ea353a 100644 --- a/gdk/broadway/gdkdnd-broadway.c +++ b/gdk/broadway/gdkdnd-broadway.c @@ -104,13 +104,6 @@ _gdk_broadway_surface_drag_begin (GdkSurface *surface, return new_context; } -static void -gdk_broadway_drag_drag_drop (GdkDrag *context, - guint32 time) -{ - g_return_if_fail (context != NULL); -} - void _gdk_broadway_surface_register_dnd (GdkSurface *surface) { @@ -128,6 +121,4 @@ gdk_broadway_drag_class_init (GdkBroadwayDragClass *klass) GdkDragClass *context_class = GDK_DRAG_CLASS (klass); object_class->finalize = gdk_broadway_drag_finalize; - - context_class->drag_drop = gdk_broadway_drag_drag_drop; } diff --git a/gdk/gdkdrag.c b/gdk/gdkdrag.c index f0ae819e02..781aaebcb6 100644 --- a/gdk/gdkdrag.c +++ b/gdk/gdkdrag.c @@ -439,24 +439,6 @@ gdk_drag_class_init (GdkDragClass *klass) g_object_class_install_properties (object_class, N_PROPERTIES, properties); } -/* - * gdk_drag_drop: - * @drag: a #GdkDrag - * @time_: the timestamp for this operation - * - * Drops on the current destination. - * - * This function is called by the drag source. - */ -void -gdk_drag_drop (GdkDrag *drag, - guint32 time_) -{ - g_return_if_fail (GDK_IS_DRAG (drag)); - - GDK_DRAG_GET_CLASS (drag)->drag_drop (drag, time_); -} - static void gdk_drag_write_done (GObject *content, GAsyncResult *result, diff --git a/gdk/gdkdragprivate.h b/gdk/gdkdragprivate.h index 665f8452e5..86c5c3a0f5 100644 --- a/gdk/gdkdragprivate.h +++ b/gdk/gdkdragprivate.h @@ -33,8 +33,6 @@ typedef struct _GdkDragClass GdkDragClass; struct _GdkDragClass { GObjectClass parent_class; - void (*drag_drop) (GdkDrag *drag, - guint32 time_); GdkSurface* (*get_drag_surface) (GdkDrag *drag); void (*set_hotspot) (GdkDrag *drag, gint hot_x, @@ -85,9 +83,6 @@ gboolean gdk_drag_handle_source_event (GdkEvent *event); GdkCursor * gdk_drag_get_cursor (GdkDrag *drag, GdkDragAction action); -void gdk_drag_drop (GdkDrag *drag, - guint32 time_); - void gdk_drag_write_async (GdkDrag *drag, const char *mime_type, GOutputStream *stream, diff --git a/gdk/wayland/gdkdrag-wayland.c b/gdk/wayland/gdkdrag-wayland.c index 6ab99d77ba..d1c2de069c 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_drop (GdkDrag *drag, - guint32 time) -{ -} - -static void gdk_wayland_drag_init (GdkWaylandDrag *drag_wayland) { GdkDrag *drag; @@ -196,7 +190,6 @@ gdk_wayland_drag_class_init (GdkWaylandDragClass *klass) object_class->finalize = gdk_wayland_drag_finalize; - 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; drag_class->drop_done = gdk_wayland_drag_drop_done; diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index 82a653df1a..86413f8c11 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -2287,7 +2287,8 @@ gdk_win32_drag_drop_performed (GdkDrag *drag, GDK_NOTE (DND, g_print ("gdk_win32_drag_drop_performed: 0x%p %u\n", drag, time_)); - gdk_drag_drop (drag, time_); + + gdk_win32_drag_drop (drag, time_); gdk_drag_set_cursor (drag, NULL); drag_context_ungrab (drag); } @@ -2564,8 +2565,6 @@ gdk_win32_drag_class_init (GdkWin32DragClass *klass) object_class->finalize = gdk_win32_drag_finalize; - drag_class->drag_drop = gdk_win32_drag_drop; - drag_class->get_drag_surface = gdk_win32_drag_get_drag_surface; drag_class->set_hotspot = gdk_win32_drag_set_hotspot; drag_class->drop_done = gdk_win32_drag_drop_done; diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 81b8db655c..eb79ab12ff 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -196,7 +196,7 @@ static gboolean gdk_x11_drag_drag_motion (GdkDrag *drag, GdkDragAction suggested_action, GdkDragAction possible_actions, guint32 time); -static void gdk_x11_drag_drag_drop (GdkDrag *drag, +static void gdk_x11_drag_drop (GdkDrag *drag, guint32 time_); static GdkSurface * gdk_x11_drag_get_drag_surface (GdkDrag *drag); static void gdk_x11_drag_set_hotspot (GdkDrag *drag, @@ -219,7 +219,6 @@ gdk_x11_drag_class_init (GdkX11DragClass *klass) object_class->finalize = gdk_x11_drag_finalize; - 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; drag_class->drop_done = gdk_x11_drag_drop_done; @@ -1600,8 +1599,8 @@ gdk_x11_drag_drag_motion (GdkDrag *drag, } static void -gdk_x11_drag_drag_drop (GdkDrag *drag, - guint32 time) +gdk_x11_drag_drop (GdkDrag *drag, + guint32 time) { GdkX11Drag *drag_x11 = GDK_X11_DRAG (drag); @@ -2165,7 +2164,7 @@ static void gdk_x11_drag_drop_performed (GdkDrag *drag, guint32 time_) { - gdk_drag_drop (drag, time_); + gdk_x11_drag_drop (drag, time_); drag_ungrab (drag); } |