From cbeb9f3ac655788bbda40c835cb4930ad726332e Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 8 Nov 2013 22:13:57 +0100 Subject: [PATCH] CComponentsWindow: remove paint() member The derived member of ComponentsForm() should be sufficiently and should serve its purpose. --- src/gui/components/cc_frm.h | 7 ++----- src/gui/components/cc_frm_window.cpp | 8 -------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h index 1cb288cff..5e62deaa0 100644 --- a/src/gui/components/cc_frm.h +++ b/src/gui/components/cc_frm.h @@ -285,16 +285,13 @@ class CComponentsWindow : public CComponentsForm ~CComponentsWindow(); - ///paint window - void paint(bool do_save_bg = CC_SAVE_SCREEN_YES); - ///add item to body object, also usable is addCCItem() to add items to the windo object void addWindowItem(CComponentsItem* cc_Item); ///allow/disallow paint a footer, default true, see also ccw_show_footer, showHeader() - void showFooter(bool show = true){ccw_show_footer = show;}; + void showFooter(bool show = true){ccw_show_footer = show; initCCWItems();}; ///allow/disallow paint a header, default true, see also ccw_show_header, showFooter() - void showHeader(bool show = true){ccw_show_header = show;}; + void showHeader(bool show = true){ccw_show_header = show; initCCWItems();}; ///set caption in header with string, see also getHeaderObject() void setWindowCaption(const std::string& text, const int& align_mode = CTextBox::NO_AUTO_LINEBREAK){ccw_caption = text; ccw_align_mode = align_mode;}; diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp index 6b66f5827..eef2f81ee 100644 --- a/src/gui/components/cc_frm_window.cpp +++ b/src/gui/components/cc_frm_window.cpp @@ -254,11 +254,3 @@ void CComponentsWindow::initCCWItems() addCCItem(ccw_footer); } -void CComponentsWindow::paint(bool do_save_bg) -{ - //prepare items before paint - initCCWItems(); - - //paint form contents - paintForm(do_save_bg); -}