0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt to fix compilation

Browse source
This commit is contained in:
Charles Dang 2016-10-16 22:52:54 +11:00
parent ebc8ddfb78
commit 30c1a852d3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/font/constants.hpp
View file

@ -27,20 +27,20 @@ extern const SDL_Color NORMAL_COLOR, GRAY_COLOR, LOBBY_COLOR, GOOD_COLOR, BAD_CO
PETRIFIED_COLOR, TITLE_COLOR, DISABLED_COLOR, LABEL_COLOR;
// font sizes, to be made theme parameters
extern CONSTEXPR int SIZE_NORMAL;
extern const int SIZE_NORMAL;
// automatic computation of other font sizes, to be made a default for theme-provided values
extern CONSTEXPR int SIZE_TINY, SIZE_SMALL,
extern const int SIZE_TINY, SIZE_SMALL,
SIZE_15, SIZE_PLUS, SIZE_LARGE, SIZE_TITLE, SIZE_XLARGE;
// For arbitrary scaling:
// (Not used in defining the SIZE_* consts because of spurious compiler warnings.)
CONSTEXPR inline int relative_size(int size)
const inline int relative_size(int size)
{
return (SIZE_NORMAL * size / 14);
}
// GUI1 built-in maximum
extern CONSTEXPR size_t max_text_line_width;
extern const size_t max_text_line_width;
// String constants
extern const std::string

4
src/tooltips.cpp
View file

@ -29,8 +29,8 @@ namespace {
CVideo* video_ = nullptr;
static CONSTEXPR int font_size = font::SIZE_NORMAL;
static CONSTEXPR int text_width = 400;
static const int font_size = font::SIZE_NORMAL;
static const int text_width = 400;
struct tooltip
{