summaryrefslogtreecommitdiff
path: root/pango/pangofc-fontmap.h
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/pangofc-fontmap.h
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/pangofc-fontmap.h')
-rw-r--r--pango/pangofc-fontmap.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h
index 9302a701..925a1467 100644
--- a/pango/pangofc-fontmap.h
+++ b/pango/pangofc-fontmap.h
@@ -84,6 +84,7 @@ struct _PangoFcFontMapClass
/*< public >*/
void (*default_substitute) (PangoFcFontMap *fontmap,
FcPattern *pattern);
+ /* Deprecated in favor of create_font */
PangoFcFont *(*new_font) (PangoFcFontMap *fontmap,
FcPattern *pattern);
@@ -93,12 +94,14 @@ struct _PangoFcFontMapClass
int *xsize,
int *ysize,
guint *flags);
+ PangoFcFont *(*create_font) (PangoFcFontMap *fontmap,
+ PangoContext *context,
+ FcPattern *pattern);
/*< private >*/
/* Padding for future expansion */
void (*_pango_reserved1) (void);
void (*_pango_reserved2) (void);
- void (*_pango_reserved3) (void);
};
PangoContext * pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap);