diff options
author | Owen Taylor <otaylor@redhat.com> | 2003-08-03 02:35:20 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2003-08-03 02:35:20 +0000 |
commit | 94f39b93e929db7881070f4b5e1f5dc3c106e3fb (patch) | |
tree | 1fa92651d4e9d2c7c41d413468f37bdb8095cd52 /pango/pangoxft.h | |
parent | e2ea77ce2f99c122a0087c28fcd9316be4d6e205 (diff) | |
download | pango-94f39b93e929db7881070f4b5e1f5dc3c106e3fb.tar.gz |
Make pangoxft depend on pangoft2.
Sat Aug 2 14:33:28 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
pangoxft depend on pangoft2.
* pango/pangofc-fontmap.[ch]: Make pangofc-fontmap.cI
into a real base class.
* pango/pangofc-font.[ch]: Move some of the pangoxft/
pangoft2 implementation here.
* pango/pangoft2.c pango/pangoft2-fontmap.c
pango/pangoft2-private.h pango/pangoxft-font.c
pango/pangoxft2-fontmap.c pango/pangoxft-private.h: Adapt
to the new scheme
* modules/*/Makefile.am Modules/*/*/*-fc.c: Don't build
separate FT2 and Xft shapers, just build one Fc shaper.
* docs/pango-sections.txt docs/pango-docs.sgml
docs/tmpl/pangofc-font{,map}.sgml: Basic docs for
the new stuff.
* configure.in: Up pango_module_version to 1.4.0.
Diffstat (limited to 'pango/pangoxft.h')
-rw-r--r-- | pango/pangoxft.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pango/pangoxft.h b/pango/pangoxft.h index bb5ce511..3f6ecfd5 100644 --- a/pango/pangoxft.h +++ b/pango/pangoxft.h @@ -38,7 +38,9 @@ G_BEGIN_DECLS #error "must have Xft version 2 or newer" #endif +#ifndef PANGO_DISABLE_DEPRECATED #define PANGO_RENDER_TYPE_XFT "PangoRenderXft" +#endif typedef void (*PangoXftSubstituteFunc) (FcPattern *pattern, gpointer data); |