diff options
| author | Hans Breuer <hans@breuer.org> | 2001-09-21 19:51:32 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2001-09-21 19:51:32 +0000 |
| commit | 2437d8fca72e6da68e08e855034178dcad4c1102 (patch) | |
| tree | 5f31dd72200d8c6092f6acba90f3a14bd6a8df7d /pango/pangowin32-private.h | |
| parent | cab449096df5d3e2029719ab212ea3701e9f3b87 (diff) | |
| download | pango-2437d8fca72e6da68e08e855034178dcad4c1102.tar.gz | |
updated externals
2001-09-21 Hans Breuer <hans@breuer.org>
* pango/pango.def : updated externals
* pango/makefile.msc : build ft2 backend too.
* pango/pangowin32-fontmap.c
- Convert PangoWin32FamilyEntry into PangoWin32Family deriving
from PangoFontFamily.
- Convert PangoWin32FontEntry into PangoWin32Face deriving
from PangoFontFace.
- Change the list_families() method of the PangoWin32FontMap
to list PangoFontFamily * rather than names.
* pango/pangowin32.c : reflect PangoFontDescription api change
* pango/pangowin32.h : don't include pango.h but only the
required headers
* modules/basic/basic-win32.c : #include "pango-engine.h"
* pango/testfonts.c : reflect recent pango api changes
Diffstat (limited to 'pango/pangowin32-private.h')
| -rw-r--r-- | pango/pangowin32-private.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pango/pangowin32-private.h b/pango/pangowin32-private.h index 2970fb49..8e3500f2 100644 --- a/pango/pangowin32-private.h +++ b/pango/pangowin32-private.h @@ -50,7 +50,7 @@ #endif typedef struct _PangoWin32Font PangoWin32Font; -typedef struct _PangoWin32FontEntry PangoWin32FontEntry; +typedef struct _PangoWin32Face PangoWin32Face; typedef struct _PangoWin32GlyphInfo PangoWin32GlyphInfo; struct _PangoWin32Font @@ -68,7 +68,7 @@ struct _PangoWin32Font gint tm_descent; gint tm_overhang; - PangoWin32FontEntry *entry; + PangoWin32Face *entry; /* If TRUE, font is in cache of recently unused fonts and not otherwise * in use. @@ -77,12 +77,16 @@ struct _PangoWin32Font GHashTable *glyph_info; }; -struct _PangoWin32FontEntry +struct _PangoWin32Face { + PangoFontFace parent_instance; + LOGFONT logfont; - PangoFontDescription description; + PangoFontDescription *description; PangoCoverage *coverage; + char *face_name; + gpointer unicode_table; GSList *cached_fonts; @@ -103,10 +107,10 @@ void pango_win32_make_matching_logfont (PangoFontMap *fontmap, const LOGFONT *lfp, int size, LOGFONT *out); -PangoCoverage * pango_win32_font_entry_get_coverage (PangoWin32FontEntry *entry); -void pango_win32_font_entry_set_coverage (PangoWin32FontEntry *entry, +PangoCoverage * pango_win32_font_entry_get_coverage (PangoWin32Face *face); +void pango_win32_font_entry_set_coverage (PangoWin32Face *face, PangoCoverage *coverage); -void pango_win32_font_entry_remove (PangoWin32FontEntry *entry, +void pango_win32_font_entry_remove (PangoWin32Face *face, PangoFont *font); void pango_win32_fontmap_cache_add (PangoFontMap *fontmap, |