diff options
| author | rubidium <rubidium@openttd.org> | 2015-08-09 12:33:27 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2015-08-09 12:33:27 +0000 |
| commit | 69fac508c386f660be4428a1e58da30ec0acd9a1 (patch) | |
| tree | 7a0fd9a382b0e7dec5966bc7e50f249021d9f91a /src/gfx_layout.h | |
| parent | bdf090b406e87ff2d0a3f3c5b6dc92b4c232dc3c (diff) | |
| download | openttd-69fac508c386f660be4428a1e58da30ec0acd9a1.tar.xz | |
(svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n)
Diffstat (limited to 'src/gfx_layout.h')
| -rw-r--r-- | src/gfx_layout.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gfx_layout.h b/src/gfx_layout.h index 7cd70ce28..0a21d9b0c 100644 --- a/src/gfx_layout.h +++ b/src/gfx_layout.h @@ -19,12 +19,12 @@ #include <map> #include <string> -#ifdef WITH_ICU +#ifdef WITH_ICU_LAYOUT #include "layout/ParagraphLayout.h" #define ICU_FONTINSTANCE : public LEFontInstance -#else /* WITH_ICU */ +#else /* WITH_ICU_LAYOUT */ #define ICU_FONTINSTANCE -#endif /* WITH_ICU */ +#endif /* WITH_ICU_LAYOUT */ /** * Text drawing parameters, which can change while drawing a line, but are kept between multiple parts @@ -75,7 +75,7 @@ public: Font(FontSize size, TextColour colour); -#ifdef WITH_ICU +#ifdef WITH_ICU_LAYOUT /* Implementation details of LEFontInstance */ le_int32 getUnitsPerEM() const; @@ -91,7 +91,7 @@ public: LEGlyphID mapCharToGlyph(LEUnicode32 ch) const; void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const; le_bool getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const; -#endif /* WITH_ICU */ +#endif /* WITH_ICU_LAYOUT */ }; /** Mapping from index to font. */ |