diff options
Diffstat (limited to 'glcdskin')
| -rw-r--r-- | glcdskin/object.c | 2 | ||||
| -rw-r--r-- | glcdskin/string.c | 8 | ||||
| -rw-r--r-- | glcdskin/string.h | 4 |
3 files changed, 13 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(); diff --git a/glcdskin/string.c b/glcdskin/string.c index bc3070d..1db3f1a 100644 --- a/glcdskin/string.c +++ b/glcdskin/string.c @@ -55,18 +55,23 @@ std::string tSkinToken::Token(const tSkinToken & Token) return result; } +#if 0 cSkinString::tStringList cSkinString::mStrings; +#endif cSkinString::cSkinString(cSkinObject *Parent, bool Translate) : mObject(Parent), mSkin(Parent->Skin()), mTranslate(Translate) { +#if 0 mStrings.push_back(this); +#endif } cSkinString::~cSkinString() { +#if 0 tStringList::iterator it = mStrings.begin(); for (; it != mStrings.end(); ++it) { if ((*it) == this) { @@ -74,8 +79,10 @@ cSkinString::~cSkinString() break; } } +#endif } +#if 0 void cSkinString::Reparse(void) { tStringList::iterator it = mStrings.begin(); @@ -84,6 +91,7 @@ void cSkinString::Reparse(void) (*it)->Parse((*it)->mOriginal, true); } } +#endif // copied from xml.c (should be valid for parsing variable names too ...) diff --git a/glcdskin/string.h b/glcdskin/string.h index b75fa11..20c517c 100644 --- a/glcdskin/string.h +++ b/glcdskin/string.h @@ -86,8 +86,10 @@ class cSkin; class cSkinString { private: +#if 0 typedef std::vector<cSkinString*> tStringList; static tStringList mStrings; +#endif cSkinObject * mObject; cSkin * mSkin; @@ -97,7 +99,9 @@ private: bool mTranslate; public: +#if 0 static void Reparse(void); +#endif cSkinString(cSkinObject *Parent, bool Translate); ~cSkinString(); |