From 94f39b93e929db7881070f4b5e1f5dc3c106e3fb Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 3 Aug 2003 02:35:20 +0000 Subject: Make pangoxft depend on pangoft2. Sat Aug 2 14:33:28 2003 Owen Taylor * 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. --- pango/pangoxft.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pango/pangoxft.h') 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); -- cgit v1.2.1