From 36315d4f3ed507bcc613eb92155d561b78e81af6 Mon Sep 17 00:00:00 2001 From: mrwastl Date: Mon, 19 Sep 2011 00:15:19 +0200 Subject: 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 --- glcdskin/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'glcdskin/object.c') 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 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(); -- cgit v1.2.3