(svn r15784) -Fix (r15779): TextAlignment and TA_* already exist on windows

This commit is contained in:
glx
2009-03-21 20:06:00 +00:00
parent 303a8f9673
commit 583c756679
8 changed files with 35 additions and 35 deletions

View File

@@ -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);