From 6cddbd51fe9e616847a17be379149822c88104bf Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 5 Feb 2006 03:11:58 +0000 Subject: Change PANGO_GLYPH_EMPTY to 0x0FFFFFFF, to not overlap with 2006-02-04 Behdad Esfahbod * pango/pango-types.h: Change PANGO_GLYPH_EMPTY to 0x0FFFFFFF, to not overlap with PANGO_GLYPH_UNKNOWN_FLAG (0x10000000). Define PANGO_GET_UNKNOWN_GLYPH(wc) that simply returns wc|PANGO_GLYPH_UNKNOWN_FLAG. * docs/pango-sections.txt, docs/tmpl/glyphs.sgml: Document new symbols. * modules/*/*.c: Use PANGO_GET_UNKNOWN_GLYPH instead of various backend-specific functions. * pango/pangofc-font.c, pango/pangoft.c, pango/pangoxft-font.c, * pango/pangowin32.c, pango/pangox.c: Suggest using PANGO_GET_UNKNOWN_GLYPH in docs. * pango/pangofc-font.h: Deprecate pango_fc_font_get_unknown_glyph(). * pango/pangowin32.h: Deprecate pango_win32_get_unknown_glyph(). --- pango/pangox.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pango/pangox.c') diff --git a/pango/pangox.c b/pango/pangox.c index 06694713..0070c28b 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -1396,7 +1396,7 @@ pango_x_find_glyph (PangoFont *font, * @font: a #PangoFont. * * Returns the index of a glyph suitable for drawing unknown characters; - * you should generally use pango_x_font_get_unknown_glyph_instead, + * you should generally use PANGO_GET_UNKNOWN_GLYPH() instead, * since that may return a glyph that provides a better representation * of a particular char. (E.g., by showing hex digits, or a glyph * representive of a certain Unicode range.) @@ -1406,7 +1406,7 @@ pango_x_find_glyph (PangoFont *font, PangoGlyph pango_x_get_unknown_glyph (PangoFont *font) { - return PANGO_GLYPH_UNKNOWN_FLAG; + return PANGO_GET_UNKNOWN_GLYPH (0); } /** @@ -1744,13 +1744,13 @@ pango_x_fallback_shape (PangoFont *font, * Returns the index of a glyph suitable for drawing @wc as an * unknown character. * + * Use PANGO_GET_UNKNOWN_GLYPH() instead. + * * Return value: a glyph index into @font. */ PangoGlyph pango_x_font_get_unknown_glyph (PangoFont *font, gunichar wc) { - g_return_val_if_fail (PANGO_IS_FONT (font), 0); - - return PANGO_GLYPH_UNKNOWN_FLAG | wc; + return PANGO_GET_UNKNOWN_GLYPH (wc); } -- cgit v1.2.1