diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-09-19 00:15:19 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-09-19 00:15:19 +0200 |
| commit | 36315d4f3ed507bcc613eb92155d561b78e81af6 (patch) | |
| tree | f641c9cf2ac4bf35053ee57033c2294375c2ed59 /glcdskin/object.c | |
| parent | face4c4bed68ae0d97d53cb0ebec6f1e02bbfbea (diff) | |
| download | graphlcd-base-36315d4f3ed507bcc613eb92155d561b78e81af6.tar.gz graphlcd-base-36315d4f3ed507bcc613eb92155d561b78e81af6.tar.bz2 | |
deactivated static method cSkinString::Reparse + static cSkinString::mStrings (wasn't used anyways, but caused big problems when using more than one display thread); beauty fixes: initialisation of static cColor-colour constants now moved to .c-file, type fix
Diffstat (limited to 'glcdskin/object.c')
| -rw-r--r-- | glcdskin/object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/glcdskin/object.c b/glcdskin/object.c index 4fda5bb..5c1e514 100644 --- a/glcdskin/object.c +++ b/glcdskin/object.c @@ -647,7 +647,7 @@ void cSkinObject::Render(GLCD::cBitmap * screen) std::vector <std::string> lines; font->WrapText(Size().w, 0/*Size().h*/, text, lines); - int amount_lines = Size().h / font->LineHeight(); + size_t amount_lines = Size().h / font->LineHeight(); if (amount_lines < lines.size()) { int multilineRelScroll = mMultilineRelScroll.Evaluate(); |