From d2f4c0876794fa2f4330e927494baaf34cf2e361 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 17 Nov 2013 20:53:45 +0100 Subject: [PATCH] CComponentsWindow: add missing member paint() This is a partial revert of f57ccb8d5a7bc031e9006ffecb473980865b4a42 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0ae3d34ceb0e5391bcb39dfc8205f8c8f463eb08 Author: Thilo Graf Date: 2013-11-17 (Sun, 17 Nov 2013) ------------------ This commit was generated by Migit --- src/gui/components/cc_frm.h | 3 +++ src/gui/components/cc_frm_window.cpp | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h index e3cb101d6..9b92e1645 100644 --- a/src/gui/components/cc_frm.h +++ b/src/gui/components/cc_frm.h @@ -317,6 +317,9 @@ class CComponentsWindow : public CComponentsForm ///refresh position and dimension and reinitialize elemenatary properties void Refresh(){initCCWItems();}; + + ///paint all window items, this overwriting paint() from CComponentsForm + virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES); }; diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp index eef2f81ee..beb623906 100644 --- a/src/gui/components/cc_frm_window.cpp +++ b/src/gui/components/cc_frm_window.cpp @@ -254,3 +254,11 @@ 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); +}