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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/gfx_layout.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp index 2dba6a204..f5463d401 100644 --- a/src/gfx_layout.cpp +++ b/src/gfx_layout.cpp @@ -17,9 +17,9 @@ #include "table/control_codes.h" -#ifdef WITH_ICU +#ifdef WITH_ICU_LAYOUT #include <unicode/ustring.h> -#endif /* WITH_ICU */ +#endif /* WITH_ICU_LAYOUT */ #include "safeguards.h" @@ -42,7 +42,7 @@ Font::Font(FontSize size, TextColour colour) : assert(size < FS_END); } -#ifdef WITH_ICU +#ifdef WITH_ICU_LAYOUT /* Implementation details of LEFontInstance */ le_int32 Font::getUnitsPerEM() const @@ -213,7 +213,7 @@ static ParagraphLayouter *GetParagraphLayout(UChar *buff, UChar *buff_end, FontM return new ICUParagraphLayout(p); } -#endif /* WITH_ICU */ +#endif /* WITH_ICU_LAYOUT */ /*** Paragraph layout ***/ /** @@ -654,7 +654,7 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi line.layout->Reflow(); } else { /* Line is new, layout it */ -#ifdef WITH_ICU +#ifdef WITH_ICU_LAYOUT FontState old_state = state; const char *old_str = str; |