diff options
author | Alexander Larsson <alexl@redhat.com> | 2018-03-20 12:05:26 +0100 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2018-03-20 12:05:26 +0100 |
commit | 9a7e721181ce714ab248429dc1258984b9e10748 (patch) | |
tree | 73d69b5c298d61cc9c045bed3bc7e54dde4aa15c /gdk/gdkdnd.c | |
parent | 890080ebf7a12199d5500fbbf6a0daf06cc2d35f (diff) | |
download | gtk+-9a7e721181ce714ab248429dc1258984b9e10748.tar.gz |
GdkSurface: Rename various functions and variables
This is an automatic rename of various things related
to the window->surface rename.
Public symbols changed by this is:
GDK_MODE_WINDOW
gdk_device_get_window_at_position
gdk_device_get_window_at_position_double
gdk_device_get_last_event_window
gdk_display_get_monitor_at_window
gdk_drag_context_get_source_window
gdk_drag_context_get_dest_window
gdk_drag_context_get_drag_window
gdk_draw_context_get_window
gdk_drawing_context_get_window
gdk_gl_context_get_window
gdk_synthesize_window_state
gdk_surface_get_window_type
gdk_x11_display_set_window_scale
gsk_renderer_new_for_window
gsk_renderer_get_window
gtk_text_view_buffer_to_window_coords
gtk_tree_view_convert_widget_to_bin_window_coords
gtk_tree_view_convert_tree_to_bin_window_coords
The commands that generated this are:
git sed -f g "GDK window" "GDK surface"
git sed -f g window_impl surface_impl
(cd gdk; git sed -f g impl_window impl_surface)
git sed -f g WINDOW_IMPL SURFACE_IMPL
git sed -f g GDK_MODE_WINDOW GDK_MODE_SURFACE
git sed -f g gdk_draw_context_get_window gdk_draw_context_get_surface
git sed -f g gdk_drawing_context_get_window gdk_drawing_context_get_surface
git sed -f g gdk_gl_context_get_window gdk_gl_context_get_surface
git sed -f g gsk_renderer_get_window gsk_renderer_get_surface
git sed -f g gsk_renderer_new_for_window gsk_renderer_new_for_surface
(cd gdk; git sed -f g window_type surface_type)
git sed -f g gdk_surface_get_window_type gdk_surface_get_surface_type
git sed -f g window_at_position surface_at_position
git sed -f g event_window event_surface
git sed -f g window_coord surface_coord
git sed -f g window_state surface_state
git sed -f g window_cursor surface_cursor
git sed -f g window_scale surface_scale
git sed -f g window_events surface_events
git sed -f g monitor_at_window monitor_at_surface
git sed -f g window_under_pointer surface_under_pointer
(cd gdk; git sed -f g for_window for_surface)
git sed -f g window_anchor surface_anchor
git sed -f g WINDOW_IS_TOPLEVEL SURFACE_IS_TOPLEVEL
git sed -f g native_window native_surface
git sed -f g source_window source_surface
git sed -f g dest_window dest_surface
git sed -f g drag_window drag_surface
git sed -f g input_window input_surface
git checkout NEWS* po-properties po docs/reference/gtk/migrating-3to4.xml
Diffstat (limited to 'gdk/gdkdnd.c')
-rw-r--r-- | gdk/gdkdnd.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index 7d6d453d2f..219f759ef3 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -171,7 +171,7 @@ gdk_drag_context_get_selected_action (GdkDragContext *context) } /** - * gdk_drag_context_get_source_window: + * gdk_drag_context_get_source_surface: * @context: a #GdkDragContext * * Returns the #GdkSurface where the DND operation started. @@ -179,15 +179,15 @@ gdk_drag_context_get_selected_action (GdkDragContext *context) * Returns: (transfer none): a #GdkSurface **/ GdkSurface * -gdk_drag_context_get_source_window (GdkDragContext *context) +gdk_drag_context_get_source_surface (GdkDragContext *context) { g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL); - return context->source_window; + return context->source_surface; } /** - * gdk_drag_context_get_dest_window: + * gdk_drag_context_get_dest_surface: * @context: a #GdkDragContext * * Returns the destination window for the DND operation. @@ -195,11 +195,11 @@ gdk_drag_context_get_source_window (GdkDragContext *context) * Returns: (transfer none): a #GdkSurface **/ GdkSurface * -gdk_drag_context_get_dest_window (GdkDragContext *context) +gdk_drag_context_get_dest_surface (GdkDragContext *context) { g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL); - return context->dest_window; + return context->dest_surface; } /** @@ -315,11 +315,11 @@ gdk_drag_context_finalize (GObject *object) g_clear_object (&context->content); g_clear_pointer (&context->formats, gdk_content_formats_unref); - if (context->source_window) - g_object_unref (context->source_window); + if (context->source_surface) + g_object_unref (context->source_surface); - if (context->dest_window) - g_object_unref (context->dest_window); + if (context->dest_surface) + g_object_unref (context->dest_surface); G_OBJECT_CLASS (gdk_drag_context_parent_class)->finalize (object); } @@ -782,7 +782,7 @@ gdk_drop_read_finish (GdkDragContext *context, } /** - * gdk_drag_context_get_drag_window: + * gdk_drag_context_get_drag_surface: * @context: a #GdkDragContext * * Returns the window on which the drag icon should be rendered @@ -795,12 +795,12 @@ gdk_drop_read_finish (GdkDragContext *context, * Returns: (nullable) (transfer none): the drag window, or %NULL */ GdkSurface * -gdk_drag_context_get_drag_window (GdkDragContext *context) +gdk_drag_context_get_drag_surface (GdkDragContext *context) { g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL); - if (GDK_DRAG_CONTEXT_GET_CLASS (context)->get_drag_window) - return GDK_DRAG_CONTEXT_GET_CLASS (context)->get_drag_window (context); + if (GDK_DRAG_CONTEXT_GET_CLASS (context)->get_drag_surface) + return GDK_DRAG_CONTEXT_GET_CLASS (context)->get_drag_surface (context); return NULL; } |