diff options
author | Benjamin Otte <otte@redhat.com> | 2018-04-12 01:02:33 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2018-04-12 14:03:40 +0200 |
commit | 3a1c69dce6f656606d1fc1f30b0733d5c71942f4 (patch) | |
tree | 32dd1d97d8a91942cfe930d27154df2cdf58b165 /gdk | |
parent | b9c8c146d2c9a410d142e9d13d1f77a296ac0e58 (diff) | |
download | gtk+-3a1c69dce6f656606d1fc1f30b0733d5c71942f4.tar.gz |
gdk: Remove gdk_cairo_get_drawing_context()
It's unused.
Diffstat (limited to 'gdk')
-rw-r--r-- | gdk/gdkcairo.h | 3 | ||||
-rw-r--r-- | gdk/gdkdrawingcontext.c | 34 |
2 files changed, 0 insertions, 37 deletions
diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h index ebac127107..0c9926fe63 100644 --- a/gdk/gdkcairo.h +++ b/gdk/gdkcairo.h @@ -71,9 +71,6 @@ void gdk_cairo_draw_from_gl (cairo_t *cr, int height); GDK_AVAILABLE_IN_ALL -GdkDrawingContext * gdk_cairo_get_drawing_context (cairo_t *cr); - -GDK_AVAILABLE_IN_ALL void gdk_cairo_surface_upload_to_gl (cairo_surface_t *surface, int target, int width, diff --git a/gdk/gdkdrawingcontext.c b/gdk/gdkdrawingcontext.c index d25a421e34..57740eeb34 100644 --- a/gdk/gdkdrawingcontext.c +++ b/gdk/gdkdrawingcontext.c @@ -82,12 +82,6 @@ gdk_drawing_context_dispose (GObject *gobject) GdkDrawingContext *self = GDK_DRAWING_CONTEXT (gobject); GdkDrawingContextPrivate *priv = gdk_drawing_context_get_instance_private (self); - /* Unset the drawing context, in case somebody is holding - * onto the Cairo context - */ - if (priv->cr != NULL) - gdk_cairo_set_drawing_context (priv->cr, NULL); - g_clear_object (&priv->surface); g_clear_object (&priv->paint_context); g_clear_pointer (&priv->clip, cairo_region_destroy); @@ -211,32 +205,6 @@ gdk_drawing_context_init (GdkDrawingContext *self) { } -static const cairo_user_data_key_t draw_context_key; - -void -gdk_cairo_set_drawing_context (cairo_t *cr, - GdkDrawingContext *context) -{ - cairo_set_user_data (cr, &draw_context_key, context, NULL); -} - -/** - * gdk_cairo_get_drawing_context: - * @cr: a Cairo context - * - * Retrieves the #GdkDrawingContext that created the Cairo - * context @cr. - * - * Returns: (transfer none) (nullable): a #GdkDrawingContext, if any is set - */ -GdkDrawingContext * -gdk_cairo_get_drawing_context (cairo_t *cr) -{ - g_return_val_if_fail (cr != NULL, NULL); - - return cairo_get_user_data (cr, &draw_context_key); -} - /** * gdk_drawing_context_get_cairo_context: * @context: a #GdkDrawingContext created with a %NULL paint context @@ -275,8 +243,6 @@ gdk_drawing_context_get_cairo_context (GdkDrawingContext *context) surface = _gdk_surface_ref_cairo_surface (priv->surface); priv->cr = cairo_create (surface); - gdk_cairo_set_drawing_context (priv->cr, context); - region = gdk_surface_get_current_paint_region (priv->surface); cairo_region_union (region, priv->clip); gdk_cairo_region (priv->cr, region); |