diff options
author | Benjamin Otte <otte@redhat.com> | 2010-06-28 14:44:12 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2010-06-29 16:06:38 +0200 |
commit | 3e96cfe8fcfeedabc09b2a8b3aa87007a3b5a2a0 (patch) | |
tree | a5b8a39ad674b77e2d1beeb234c0cdd48d218b20 /gdk/gdkpango.c | |
parent | 52200eee01cc055adaefb678d6c6f04455d1a593 (diff) | |
download | gtk+-3e96cfe8fcfeedabc09b2a8b3aa87007a3b5a2a0.tar.gz |
Deprecate the GdkRegion API
Includes fixing all callers to use the cairo region API instead. This is
usually just replacing the function names, the only difference is
gdk_region_get_rectangles() being replaced by
cairo_region_num_rectangles() and cairo_region_get_rectangle() which
required a bit more work.
https://bugzilla.gnome.org/show_bug.cgi?id=613284
Diffstat (limited to 'gdk/gdkpango.c')
-rw-r--r-- | gdk/gdkpango.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index a4ca42436f..2707817df9 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -1255,7 +1255,7 @@ layout_iter_get_line_clip_region (PangoLayoutIter *iter, line = pango_layout_iter_get_line_readonly (iter); - clip_region = gdk_region_new (); + clip_region = cairo_region_create (); pango_layout_iter_get_line_extents (iter, NULL, &logical_rect); baseline = pango_layout_iter_get_baseline (iter); @@ -1289,7 +1289,7 @@ layout_iter_get_line_clip_region (PangoLayoutIter *iter, rect.width = PANGO_PIXELS (pixel_ranges[2*j + 1] - logical_rect.x) - x_off; rect.height = PANGO_PIXELS (baseline - logical_rect.y + logical_rect.height) - y_off; - gdk_region_union_with_rect (clip_region, &rect); + cairo_region_union_rectangle (clip_region, &rect); } g_free (pixel_ranges); @@ -1380,7 +1380,7 @@ gdk_pango_layout_get_clip_region (PangoLayout *layout, g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL); g_return_val_if_fail (index_ranges != NULL, NULL); - clip_region = gdk_region_new (); + clip_region = cairo_region_create (); iter = pango_layout_get_iter (layout); @@ -1399,8 +1399,8 @@ gdk_pango_layout_get_clip_region (PangoLayout *layout, index_ranges, n_ranges); - gdk_region_union (clip_region, line_region); - gdk_region_destroy (line_region); + cairo_region_union (clip_region, line_region); + cairo_region_destroy (line_region); } while (pango_layout_iter_next_line (iter)); |