dnd: Remove gdk_drag_context_get_dest_surface()

... and gdk_drag_context_get_source_surface().

In the backends, use direct access to the variables instead.

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index a9d746607b2c88f03cf1b937dd481cc20a46aa74..70e5d90c17408af9c932def63bccfb7345027552 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -794,8 +794,6 @@ gdk_drag_context_get_suggested_action
 gdk_drag_context_get_selected_action
 gdk_drag_context_get_formats
 gdk_drag_context_get_device
-gdk_drag_context_get_source_surface
-gdk_drag_context_get_dest_surface
 gdk_drag_context_get_drag_surface
 gdk_drag_context_set_hotspot
 

diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index 45c69f93b23159fd46451da0865fefeb6e2c77e9..09d28ab129bb0a888ded334865c8526dd33cfe20 100644 (file)
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -209,38 +209,6 @@ gdk_drag_context_get_selected_action (GdkDragContext *context)
   return context->action;
 }
 
-/**
- * gdk_drag_context_get_source_surface:
- * @context: a #GdkDragContext
- *
- * Returns the #GdkSurface where the DND operation started.
- *
- * Returns: (transfer none): a #GdkSurface
- **/
-GdkSurface *
-gdk_drag_context_get_source_surface (GdkDragContext *context)
-{
-  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL);
-
-  return context->source_surface;
-}
-
-/**
- * gdk_drag_context_get_dest_surface:
- * @context: a #GdkDragContext
- *
- * Returns the destination surface for the DND operation.
- *
- * Returns: (transfer none): a #GdkSurface
- **/
-GdkSurface *
-gdk_drag_context_get_dest_surface (GdkDragContext *context)
-{
-  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL);
-
-  return context->dest_surface;
-}
-
 /**
  * gdk_drag_context_get_device:
  * @context: a #GdkDragContext

diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 506aa93aeb95f3c019b8d4fb736a249fe345b385..8db67d8f1362c58a6ed42f4a271a9ba722ea4198 100644 (file)
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -72,11 +72,6 @@ GdkDragAction    gdk_drag_context_get_suggested_action (GdkDragContext *context)
 GDK_AVAILABLE_IN_ALL
 GdkDragAction    gdk_drag_context_get_selected_action  (GdkDragContext *context);
 
-GDK_AVAILABLE_IN_ALL
-GdkSurface       *gdk_drag_context_get_source_surface    (GdkDragContext *context);
-GDK_AVAILABLE_IN_ALL
-GdkSurface       *gdk_drag_context_get_dest_surface      (GdkDragContext *context);
-
 GDK_AVAILABLE_IN_ALL
 GdkDragAction     gdk_drag_action_is_unique            (GdkDragAction   action);
 

diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index 8ad7322f86f1ca9416c2ef1089beedfea9aa58e5..31243deafcc0f5cf07814f6ed93ca1ce44dddce5 100644 (file)
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -2439,7 +2439,7 @@ gdk_dnd_handle_key_event (GdkDragContext    *drag,
         case GDK_KEY_KP_Enter:
         case GDK_KEY_KP_Space:
           if ((gdk_drag_context_get_selected_action (drag) != 0) &&
-              (gdk_drag_context_get_dest_surface (drag) != NULL))
+              (drag->dest_surface != NULL))
             {
               g_signal_emit_by_name (drag, "drop-performed",
                                      gdk_event_get_time ((GdkEvent *) event));

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 0a66ce4e93d643dd3406669799e12af31dd3ab34..7b4c6d29a9f4edf8118be45354c1d09fa1362c55 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -3082,7 +3082,7 @@ gdk_dnd_handle_key_event (GdkDragContext    *context,
         case GDK_KEY_KP_Enter:
         case GDK_KEY_KP_Space:
           if ((gdk_drag_context_get_selected_action (context) != 0) &&
-              (gdk_drag_context_get_dest_surface (context) != NULL))
+              (context->dest_surface != NULL))
             {
               g_signal_emit_by_name (context, "drop-performed",
                                      gdk_event_get_time ((GdkEvent *) event));
@@ -3170,7 +3170,7 @@ gdk_dnd_handle_button_event (GdkDragContext       *context,
 #endif
 
   if ((gdk_drag_context_get_selected_action (context) != 0) &&
-      (gdk_drag_context_get_dest_surface (context) != NULL))
+      (context->dest_surface != NULL))
     {
       g_signal_emit_by_name (context, "drop-performed",
                              gdk_event_get_time ((GdkEvent *) event));