Prioritize the fontconfig font lister over the freetype one when both freetype and fontconfig are available

Originally committed to SVN as r4824.
This commit is contained in:
Thomas Goyne 2010-10-22 18:25:02 +00:00
parent 4af788be1a
commit 3174f995fa

View file

@ -44,12 +44,12 @@
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#endif #endif
#ifdef WITH_FREETYPE2 #ifdef WITH_FONTCONFIG
#include "font_file_lister_freetype.h"
#define FontListerClass FreetypeFontFileLister
#elif defined(WITH_FONTCONFIG)
#include "font_file_lister_fontconfig.h" #include "font_file_lister_fontconfig.h"
#define FontListerClass FontConfigFontFileLister #define FontListerClass FontConfigFontFileLister
#elif defined(WITH_FREETYPE2)
#include "font_file_lister_freetype.h"
#define FontListerClass FreetypeFontFileLister
#else #else
#include "font_file_lister.h" #include "font_file_lister.h"
#endif #endif