From 7cc66fea93ba93f8cc18d070a03e73a57fb90166 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 11 Mar 2014 21:20:30 +0100 Subject: [PATCH] CComponentsFrmChain: add missing parameter 'parent' supplement to 23d7b62cf04845305af22fb54716c16c05063941 --- src/gui/components/cc_frm_chain.cpp | 7 +++++-- src/gui/components/cc_frm_chain.h | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gui/components/cc_frm_chain.cpp b/src/gui/components/cc_frm_chain.cpp index 6603b18bf..c893df239 100644 --- a/src/gui/components/cc_frm_chain.cpp +++ b/src/gui/components/cc_frm_chain.cpp @@ -3,7 +3,7 @@ Copyright (C) 2001 by Steffen Hehn 'McClean' Classes for generic GUI-related components. - Copyright (C) 2013, Thilo Graf 'dbt' + Copyright (C) 2013-2014, Thilo Graf 'dbt' License: GPL @@ -34,12 +34,13 @@ CComponentsFrmChain::CComponentsFrmChain( const int& x_pos, const int& y_pos, co bool horizontal, bool dynamic_width, bool dynamic_height, + CComponentsForm* parent, bool has_shadow, fb_pixel_t& color_frame, fb_pixel_t& color_body, fb_pixel_t& color_shadow) { - initVarChain(x_pos, y_pos, w, h, v_items, horizontal, dynamic_width, dynamic_height, has_shadow, color_frame, color_body, color_shadow); + initVarChain(x_pos, y_pos, w, h, v_items, horizontal, dynamic_width, dynamic_height, parent, has_shadow, color_frame, color_body, color_shadow); } @@ -48,6 +49,7 @@ void CComponentsFrmChain::initVarChain( const int& x_pos, const int& y_pos, cons bool horizontal, bool dynamic_width, bool dynamic_height, + CComponentsForm* parent, bool has_shadow, fb_pixel_t& color_frame, fb_pixel_t& color_body, @@ -74,6 +76,7 @@ void CComponentsFrmChain::initVarChain( const int& x_pos, const int& y_pos, cons addCCItem(*v_items); initCChainItems(); } + initParent(parent); } void CComponentsFrmChain::initCChainItems() diff --git a/src/gui/components/cc_frm_chain.h b/src/gui/components/cc_frm_chain.h index d18461f06..5b49eef39 100644 --- a/src/gui/components/cc_frm_chain.h +++ b/src/gui/components/cc_frm_chain.h @@ -3,7 +3,7 @@ Copyright (C) 2001 by Steffen Hehn 'McClean' Classes for generic GUI-related components. - Copyright (C) 2013, Thilo Graf 'dbt' + Copyright (C) 2013-2014, Thilo Graf 'dbt' License: GPL @@ -53,6 +53,7 @@ class CComponentsFrmChain : public CComponentsForm bool horizontal, bool dynamic_width, bool dynamic_height, + CComponentsForm* parent, bool has_shadow, fb_pixel_t& color_frame, fb_pixel_t& color_body, @@ -68,6 +69,7 @@ class CComponentsFrmChain : public CComponentsForm bool horizontal = true, bool dynamic_width = false, bool dynamic_height = false, + CComponentsForm* parent = NULL, bool has_shadow = CC_SHADOW_OFF, fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t& color_body = COL_MENUHEAD_PLUS_0,