summaryrefslogtreecommitdiff
path: root/pango/pangocairo-font.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2005-02-03 20:23:19 +0000
committerOwen Taylor <otaylor@src.gnome.org>2005-02-03 20:23:19 +0000
commit7782bba2c87b79bff8fa4e62ed84b95b74574617 (patch)
tree79d989164f0c8ab27e825ef98ef3c47a14c39228 /pango/pangocairo-font.c
parentc7e3de50fdaec8436fd78b229bbdf04c6c9271d3 (diff)
downloadpango-7782bba2c87b79bff8fa4e62ed84b95b74574617.tar.gz
Open the file with mode "wb", include cairo-png.h.
2005-02-03 Owen Taylor <otaylor@redhat.com> * examples/cairosimple.c: Open the file with mode "wb", include cairo-png.h. * examples/xftview.c examples/cairoview.c: Set WM_NORMAL_HINTS to avoid triggering a metacity bug. * examples/cairoview.c: Include cairo-xlib.h. * configure.in: Add checks for the Win32 Cairo backend. (not committing the code yet). * examples/Makefile.am pango/Makefile.am: add CAIRO_CFLAGS. * pango/pangocairo-fc.h pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap.c pango/pangofc-fontmap.[ch]: Rework Cairo/Fontconfig backend to use the current Cairo API. Make some PangoFcFontMap changes to enable that. * pango/pango/pangocairo-private.h pango/pangocairo-render.c: Update for cairo_font_t changes.
Diffstat (limited to 'pango/pangocairo-font.c')
-rw-r--r--pango/pangocairo-font.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c
index 7aae83ec..756e1044 100644
--- a/pango/pangocairo-font.c
+++ b/pango/pangocairo-font.c
@@ -55,15 +55,13 @@ pango_cairo_font_get_type (void)
/**
* _pango_cairo_font_get_cairo_font:
* @font: a #PangoCairoFont
- * @cr: a #CairoConext
*
- * Install the font and size of @font onto @cr
+ * Get the cairo_font_t for a PangoCairoFont.
**/
-void
-_pango_cairo_font_make_current (PangoCairoFont *font,
- cairo_t *cr)
+cairo_font_t *
+_pango_cairo_font_get_cairo_font (PangoCairoFont *font)
{
- g_return_if_fail (PANGO_IS_CAIRO_FONT (font));
+ g_return_val_if_fail (PANGO_IS_CAIRO_FONT (font), NULL);
- return (* PANGO_CAIRO_FONT_GET_IFACE (font)->make_current) (font, cr);
+ return (* PANGO_CAIRO_FONT_GET_IFACE (font)->get_cairo_font) (font);
}