diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-11-09 21:41:52 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-01-26 21:49:11 +0800 |
| commit | 691008dd139a2c675dd9ccefdbf1bcf183da80a2 (patch) | |
| tree | 9dd5650cd13a523024c09fb59875fbb47ce79777 /libgnomecanvas/gnome-canvas-text.c | |
| parent | 72341218cf303a7bb1151804d26e56d6b7f1e403 (diff) | |
| download | gsoc2013-evolution-691008dd139a2c675dd9ccefdbf1bcf183da80a2.tar gsoc2013-evolution-691008dd139a2c675dd9ccefdbf1bcf183da80a2.tar.gz gsoc2013-evolution-691008dd139a2c675dd9ccefdbf1bcf183da80a2.tar.bz2 gsoc2013-evolution-691008dd139a2c675dd9ccefdbf1bcf183da80a2.tar.lz gsoc2013-evolution-691008dd139a2c675dd9ccefdbf1bcf183da80a2.tar.xz gsoc2013-evolution-691008dd139a2c675dd9ccefdbf1bcf183da80a2.tar.zst gsoc2013-evolution-691008dd139a2c675dd9ccefdbf1bcf183da80a2.zip | |
Adapt GnomeCanvas to latest gtk+-3.0 API.
Diffstat (limited to 'libgnomecanvas/gnome-canvas-text.c')
| -rw-r--r-- | libgnomecanvas/gnome-canvas-text.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index a2dce90d64..a012c76df8 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -106,7 +106,7 @@ static void gnome_canvas_text_get_property (GObject *object, GParamSpec *pspec); static void gnome_canvas_text_update (GnomeCanvasItem *item, const cairo_matrix_t *matrix, gint flags); -static void gnome_canvas_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, +static void gnome_canvas_text_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint height); static GnomeCanvasItem *gnome_canvas_text_point (GnomeCanvasItem *item, gdouble x, @@ -1189,16 +1189,16 @@ gnome_canvas_text_update (GnomeCanvasItem *item, /* Draw handler for the text item */ static void -gnome_canvas_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, +gnome_canvas_text_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint height) { GnomeCanvasText *text = GNOME_CANVAS_TEXT (item); - cairo_t *cr; if (!text->text) return; - cr = gdk_cairo_create (drawable); + cairo_save (cr); + if (text->clip) { cairo_rectangle (cr, text->clip_cx - x, @@ -1217,7 +1217,7 @@ gnome_canvas_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, cairo_move_to (cr, text->cx - x, text->cy - y); pango_cairo_show_layout (cr, text->layout); - cairo_destroy (cr); + cairo_restore (cr); } /* Point handler for the text item */ |