From 3ab2393b6932b34e7f0e69af7f843d1303104d79 Mon Sep 17 00:00:00 2001 From: Christian Tusche Date: Sun, 29 Jul 2007 19:01:17 +0200 Subject: 2007-07-29: Version 1.1-cvs_ext-0.11 (text2skin-1.1-cvs_ext-0.11.diff) - moved state tracking of marquee, blink, scroll from cText2SkinRender to cxObject - fixed compatibility with gcc-4 and vdr-1.5.x - fixed use of Update.Lock() in render.h - new: dynamic width/height of objects - new: Option "bgColor" used for items "Text", "Marquee", and "Blink". - remember period to next timeout when doing a non-timeout refresh prevent occasional start/stop of marquee-text --- xml/skin.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xml/skin.h') diff --git a/xml/skin.h b/xml/skin.h index 4613199..69d96e6 100644 --- a/xml/skin.h +++ b/xml/skin.h @@ -28,21 +28,21 @@ public: bool Limit( int ma, int min ) const { return mMajor < ma ? true : (mMajor == ma ? mMinor <= min : false); } - bool cxVersion::operator==( const cxVersion &v ) const { + bool operator==( const cxVersion &v ) const { return mMajor == v.mMajor && mMinor == v.mMinor; } - bool cxVersion::operator>=( const cxVersion &v ) const { + bool operator>=( const cxVersion &v ) const { return Require( v.mMajor , v.mMinor); } - bool cxVersion::operator>=( const char *c ) const { + bool operator>=( const char *c ) const { cxVersion v; if( !v.Parse(c) ) return false; return Require( v.mMajor , v.mMinor); } - bool cxVersion::operator<=( const cxVersion &v ) const { + bool operator<=( const cxVersion &v ) const { return Limit( v.mMajor , v.mMinor ); } - bool cxVersion::operator<=( const char *c ) const { + bool operator<=( const char *c ) const { cxVersion v; if( !v.Parse(c) ) return false; return Limit( v.mMajor , v.mMinor); -- cgit v1.2.3