From e37b5d86f4fc4b236e9ad7f2f03a9ad6d074ec6b Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 23 Oct 2012 15:39:04 +0200 Subject: [PATCH] CComponents: add missing paint-members to circle and square classes paint () ist in CComponentsItem abstrakt, muss definiert werden seine eigene in Unterklassen. --- src/gui/components/cc.h | 3 +++ src/gui/components/components.cpp | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/gui/components/cc.h b/src/gui/components/cc.h index df6cb21b4..57e211dbc 100644 --- a/src/gui/components/cc.h +++ b/src/gui/components/cc.h @@ -293,6 +293,7 @@ class CComponentsShapeCircle : public CComponentsItem inline void setDiam(const int& diam){d=width=height=diam, corner_rad=d/2;}; inline int getDiam(){return d;}; + void paint(bool do_save_bg = CC_SAVE_SCREEN_YES); }; class CComponentsShapeSquare : public CComponentsItem @@ -300,6 +301,8 @@ class CComponentsShapeSquare : public CComponentsItem public: CComponentsShapeSquare( const int x_pos, const int y_pos, const int w, const int h, bool has_shadow = CC_SHADOW_ON, fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0); + + void paint(bool do_save_bg = CC_SAVE_SCREEN_YES); }; class CComponentsPIP : public CComponentsItem diff --git a/src/gui/components/components.cpp b/src/gui/components/components.cpp index 67be75ec0..d77ea0d12 100644 --- a/src/gui/components/components.cpp +++ b/src/gui/components/components.cpp @@ -513,6 +513,12 @@ CComponentsShapeSquare::CComponentsShapeSquare(const int x_pos, const int y_pos, col_shadow = color_shadow; } +void CComponentsShapeSquare::paint(bool do_save_bg) +{ + paintInit(do_save_bg); +} + + //------------------------------------------------------------------------------------------------------- //sub class CComponentsShapeCircle from CComponentsItem CComponentsShapeCircle::CComponentsShapeCircle( int x_pos, int y_pos, int diam, bool has_shadow, @@ -549,6 +555,11 @@ CComponentsShapeCircle::CComponentsShapeCircle( int x_pos, int y_pos, int diam, // // + - + +void CComponentsShapeCircle::paint(bool do_save_bg) +{ + paintInit(do_save_bg); +} + //------------------------------------------------------------------------------------------------------- //sub class CComponentsDetailLine from CComponents