aboutsummaryrefslogtreecommitdiffstats
path: root/src/macfont.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/macfont.h')
-rw-r--r--src/macfont.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/macfont.h b/src/macfont.h
index 7421cd63a79..e6e45ab152c 100644
--- a/src/macfont.h
+++ b/src/macfont.h
@@ -57,11 +57,7 @@ typedef CTCharacterCollection CharacterCollection;
57#define MAC_FONT_CASCADE_LIST_ATTRIBUTE kCTFontCascadeListAttribute 57#define MAC_FONT_CASCADE_LIST_ATTRIBUTE kCTFontCascadeListAttribute
58#define MAC_FONT_CHARACTER_SET_ATTRIBUTE kCTFontCharacterSetAttribute 58#define MAC_FONT_CHARACTER_SET_ATTRIBUTE kCTFontCharacterSetAttribute
59#define MAC_FONT_LANGUAGES_ATTRIBUTE kCTFontLanguagesAttribute 59#define MAC_FONT_LANGUAGES_ATTRIBUTE kCTFontLanguagesAttribute
60#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
61#define MAC_FONT_FORMAT_ATTRIBUTE kCTFontFormatAttribute 60#define MAC_FONT_FORMAT_ATTRIBUTE kCTFontFormatAttribute
62#else
63#define MAC_FONT_FORMAT_ATTRIBUTE (CFSTR ("NSCTFontFormatAttribute"))
64#endif
65#define MAC_FONT_SYMBOLIC_TRAIT kCTFontSymbolicTrait 61#define MAC_FONT_SYMBOLIC_TRAIT kCTFontSymbolicTrait
66#define MAC_FONT_WEIGHT_TRAIT kCTFontWeightTrait 62#define MAC_FONT_WEIGHT_TRAIT kCTFontWeightTrait
67#define MAC_FONT_WIDTH_TRAIT kCTFontWidthTrait 63#define MAC_FONT_WIDTH_TRAIT kCTFontWidthTrait
@@ -79,11 +75,7 @@ enum {
79}; 75};
80 76
81enum { 77enum {
82#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
83 MAC_FONT_FORMAT_BITMAP = kCTFontFormatBitmap 78 MAC_FONT_FORMAT_BITMAP = kCTFontFormatBitmap
84#else
85 MAC_FONT_FORMAT_BITMAP = 5
86#endif
87}; 79};
88 80
89enum { 81enum {
@@ -112,13 +104,8 @@ enum {
112#define mac_font_get_underline_position CTFontGetUnderlinePosition 104#define mac_font_get_underline_position CTFontGetUnderlinePosition
113#define mac_font_get_underline_thickness CTFontGetUnderlineThickness 105#define mac_font_get_underline_thickness CTFontGetUnderlineThickness
114#define mac_font_copy_graphics_font(font) CTFontCopyGraphicsFont (font, NULL) 106#define mac_font_copy_graphics_font(font) CTFontCopyGraphicsFont (font, NULL)
115#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
116#define mac_font_copy_non_synthetic_table(font, table) \ 107#define mac_font_copy_non_synthetic_table(font, table) \
117 CTFontCopyTable (font, table, kCTFontTableOptionNoOptions) 108 CTFontCopyTable (font, table, kCTFontTableOptionNoOptions)
118#else
119#define mac_font_copy_non_synthetic_table(font, table) \
120 CTFontCopyTable (font, table, kCTFontTableOptionExcludeSynthetic)
121#endif
122 109
123#define mac_font_create_preferred_family_for_attributes \ 110#define mac_font_create_preferred_family_for_attributes \
124 mac_ctfont_create_preferred_family_for_attributes 111 mac_ctfont_create_preferred_family_for_attributes