From 40fd20f76dabaed2488756117967025ec7bf6b1f Mon Sep 17 00:00:00 2001 From: lordjaxom Date: Wed, 29 Dec 2004 00:38:08 +0000 Subject: - fixed marquee in lists --- xml/object.c | 4 ++-- xml/parser.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'xml') diff --git a/xml/object.c b/xml/object.c index 20e0eb3..e9d54ca 100644 --- a/xml/object.c +++ b/xml/object.c @@ -1,5 +1,5 @@ /* - * $Id: object.c,v 1.6 2004/12/28 18:03:24 lordjaxom Exp $ + * $Id: object.c,v 1.7 2004/12/29 00:38:08 lordjaxom Exp $ */ #include "xml/object.h" @@ -51,7 +51,7 @@ cxObject::cxObject(const cxObject &Src): mFontFace(Src.mFontFace), mFontSize(Src.mFontSize), mFontWidth(Src.mFontSize), - mDelay(0), + mDelay(Src.mDelay), mObjects(NULL), mDisplay(Src.mDisplay), mSkin(Src.mSkin) diff --git a/xml/parser.c b/xml/parser.c index 02de60e..02c1c4a 100644 --- a/xml/parser.c +++ b/xml/parser.c @@ -1,5 +1,5 @@ /* - * $Id: parser.c,v 1.4 2004/12/28 14:25:45 lordjaxom Exp $ + * $Id: parser.c,v 1.5 2004/12/29 00:38:08 lordjaxom Exp $ */ #include "xml/parser.h" @@ -244,6 +244,9 @@ bool xEndElem(const std::string &name) { if (object->mCondition == NULL) { switch (object->mType) { case cxObject::text: + case cxObject::marquee: + case cxObject::blink: + case cxObject::scrolltext: object->mCondition = new cxFunction(object->mText); break; -- cgit v1.2.3