diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-02-24 19:52:40 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-02-24 19:52:40 +0000 |
| commit | a1d88c49c68f60982dd8301a913d2930728fc77d (patch) | |
| tree | 601dac7acc0d6131a413c9ad23171515ca50c432 /pango/Makefile.am | |
| parent | f0653b4131c0c2d811f662785a7b4d971d370bef (diff) | |
| download | pango-a1d88c49c68f60982dd8301a913d2930728fc77d.tar.gz | |
PangoCairoFontMap for win32 fonts.
2005-02-24 Owen Taylor <otaylor@redhat.com>
* pango/pangocairo-win32.h pango/pangocairo-win32font.c
pango/pangocairo-win32fontmap.c pango/Makefile.am:
PangoCairoFontMap for win32 fonts.
* pango/pangocairo-fontmap.c: Use PangoCairoWin32FontMap
when available.
* pango/pangowin32.h pango/pangowin32-fontmap.h pango/pangowin32.c:
Add virtual pango_win32_font_select_font()
to prepare a DC for use with a PangoWin32Font, and to release,
pango_win32_font_scale_font() to get logical unit => Pango units scale,
pango_win32_font_done_font() to release resources.
* pango/pangowin32-fontmap.[ch]: Add a find_font() virtual method
to allow subclasses that change how PangoFont lookup and
creation happens.
* pango/pangowin32-fontmap.c: Move initialization into
pango_win32_font_map_init() to facilitate derivation.
* pango/pangowin2.c pango/pangowin32-fontmap.c
pango/pangowin32-private.h: Move PangoWin32Font/PangoWin32FontMap
definitions into pangowin32-private.h to allow derivation for
PangoCairoWin32Font.
* modules/basic/basic-win32.c: Use pango_win32_font_select_font()
and friends.
* modules/basic/basic-win32.c: Use g_utf8_to_utf16 instead
of g_convert for simplicity and speed.
* pango/fonts.c (pango_font_get_font_map) pango/pango-font.h
pango/pangofc-font.c pango/pangowin32.c pango/pango.c pango/pango.def
docs/pango-sections.txt: Add a virtual function to get the fontmap
for a font.
* pango/pangocairo-render.c: Use pango_font_get_font_map()
rather than PangoFcFontMap hack.
* pango/pango-types.h: Move the declaration of PangoFontMap here
to avoid interactions between pango-font.h and pango-fontmap.h.
* pango/pangocairo.h: Remove accidental include
of pangofc-fontmap.h.
Diffstat (limited to 'pango/Makefile.am')
| -rw-r--r-- | pango/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 185900b9..25d383ae 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -222,7 +222,7 @@ lib_LTLIBRARIES += libpangocairo-1.0.la endif libpangocairo_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) -libpangocairo_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(CAIRO_LIBS) $(GLIB_LIBS) +libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(CAIRO_LIBS) $(GLIB_LIBS) libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la libpangocairo_1_0_la_SOURCES = \ @@ -231,8 +231,15 @@ libpangocairo_1_0_la_SOURCES = \ pangocairo-render.c \ pangocairo-private.h +if HAVE_CAIRO_WIN32 +libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la +libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la + +libpangocairo_1_0_la_SOURCES += pangocairo-win32font.c pangocairo-win32fontmap.c pangocairo-win32.h +endif + if HAVE_CAIRO_FREETYPE -libpangocairo_1_0_la_LIBADD += $(FREETYPE_LIBS) +libpangocairo_1_0_la_LIBADD += libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) libpangocairo_1_0_la_DEPENDENCIES += libpangoft2-$(PANGO_API_VERSION).la libpangocairo_1_0_la_SOURCES += \ |