diff options
| author | John Ralls <jralls@ceridwen.us> | 2012-08-22 09:38:47 -0700 |
|---|---|---|
| committer | John Ralls <jralls@ceridwen.us> | 2012-08-22 09:38:47 -0700 |
| commit | 1b81931936c65774dce13864f632f0630325bace (patch) | |
| tree | aec19a5928ae0dc1bbd42464fa54eaa54ca049e3 /pango/pangocairo-fontmap.c | |
| parent | 42e01e32cd8ac070883f3456c65024019f1f73ac (diff) | |
| download | pango-1b81931936c65774dce13864f632f0630325bace.tar.gz | |
Still more atsui removal
CoreText works now!
Diffstat (limited to 'pango/pangocairo-fontmap.c')
| -rw-r--r-- | pango/pangocairo-fontmap.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index d5bff788..e0ff95f9 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -25,12 +25,8 @@ #include "pangocairo-private.h" #include "pango-impl-utils.h" -#if defined (HAVE_CAIRO_ATSUI) -# if defined (HAVE_CORE_TEXT) -# include "pangocairo-coretext.h" -# else -# include "pangocairo-atsui.h" -# endif +#if defined (HAVE_CORE_TEXT) +# include "pangocairo-coretext.h" #endif #if defined (HAVE_CAIRO_WIN32) # include "pangocairo-win32.h" @@ -73,12 +69,8 @@ pango_cairo_font_map_new (void) /* Make sure that the type system is initialized */ g_type_init (); -#if defined(HAVE_CAIRO_ATSUI) #if defined(HAVE_CORE_TEXT) return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL); -#else - return g_object_new (PANGO_TYPE_CAIRO_ATSUI_FONT_MAP, NULL); -#endif #elif defined(HAVE_CAIRO_WIN32) return g_object_new (PANGO_TYPE_CAIRO_WIN32_FONT_MAP, NULL); #elif defined(HAVE_CAIRO_FREETYPE) @@ -115,13 +107,9 @@ pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype) switch ((int) fonttype) { -#if defined(HAVE_CAIRO_ATSUI) - case CAIRO_FONT_TYPE_QUARTZ: #if defined(HAVE_CORE_TEXT) + case CAIRO_FONT_TYPE_QUARTZ: return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL); -#else - return g_object_new (PANGO_TYPE_CAIRO_ATSUI_FONT_MAP, NULL); -#endif #endif #if defined(HAVE_CAIRO_WIN32) case CAIRO_FONT_TYPE_WIN32: |