diff options
| author | glx <glx@openttd.org> | 2009-03-21 20:06:00 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2009-03-21 20:06:00 +0000 |
| commit | 9fcff01850c4c18543c60cf477926b793052f1fd (patch) | |
| tree | b60f373c4dbeca6a61968b68545bba3b1fab659e /src/gfx_func.h | |
| parent | 93fe44a3c561e357313af0f8332a697b46812474 (diff) | |
| download | openttd-9fcff01850c4c18543c60cf477926b793052f1fd.tar.xz | |
(svn r15784) -Fix (r15779): TextAlignment and TA_* already exist on windows
Diffstat (limited to 'src/gfx_func.h')
| -rw-r--r-- | src/gfx_func.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gfx_func.h b/src/gfx_func.h index 91a696a5b..183045abe 100644 --- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -86,14 +86,14 @@ void GfxScroll(int left, int top, int width, int height, int xo, int yo); void DrawSprite(SpriteID img, SpriteID pal, int x, int y, const SubSprite *sub = NULL); /** How to align the to-be drawn text. */ -enum TextAlignment { - TA_LEFT, ///< Left align the text - TA_CENTER, ///< Center the text - TA_RIGHT, ///< Right align the text +enum StringAlignment { + SA_LEFT, ///< Left align the text + SA_CENTER, ///< Center the text + SA_RIGHT, ///< Right align the text }; -int DrawString(int left, int right, int top, const char *str, TextColour colour, TextAlignment align = TA_LEFT, bool underline = false); -int DrawString(int left, int right, int top, StringID str, TextColour colour, TextAlignment align = TA_LEFT, bool underline = false); +int DrawString(int left, int right, int top, const char *str, TextColour colour, StringAlignment align = SA_LEFT, bool underline = false); +int DrawString(int left, int right, int top, StringID str, TextColour colour, StringAlignment align = SA_LEFT, bool underline = false); int DrawStringCentered(int x, int y, StringID str, TextColour colour); int DoDrawStringCentered(int x, int y, const char *str, TextColour colour); |