From 098905e8e18f955e6a0c863d791e6f9ad18ef23f Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 10 Nov 2016 09:08:47 +0100 Subject: [PATCH] CMenuTarget: outsource CMenuTarget-class It's required for some inheritations into other classes if include of menue.h is not wanted --- src/gui/widget/menue.h | 14 +----------- src/gui/widget/menue_target.h | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 src/gui/widget/menue_target.h diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 104078179..bc527ed68 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -47,6 +47,7 @@ #include #include #include +#include "menue_target.h" extern "C" { #include #include @@ -100,19 +101,6 @@ class CActivateObserver virtual void activateNotify(const neutrino_locale_t /*OptionName*/) {} }; -class CMenuTarget -{ - protected: - std::string *valueString; - std::string valueStringTmp; - public: - CMenuTarget(){ valueString = &valueStringTmp; } - virtual ~CMenuTarget(){} - virtual void hide(){} - virtual int exec(CMenuTarget* parent, const std::string & actionKey) = 0; - virtual std::string &getValue(void) { return *valueString; } - virtual fb_pixel_t getColor(void) { return 0; } -}; class CMenuItem : public CComponentsSignals { diff --git a/src/gui/widget/menue_target.h b/src/gui/widget/menue_target.h new file mode 100644 index 000000000..772831033 --- /dev/null +++ b/src/gui/widget/menue_target.h @@ -0,0 +1,42 @@ +/* + Based up Neutrino-GUI - Tuxbox-Project + Copyright (C) 2001 by Steffen Hehn 'McClean' + + License: GPL + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + + +#ifndef __MENU_TARGET__ +#define __MENU_TARGET__ + + + +class CMenuTarget +{ + protected: + std::string *valueString; + std::string valueStringTmp; + public: + CMenuTarget(){ valueString = &valueStringTmp; } + virtual ~CMenuTarget(){} + virtual void hide(){} + virtual int exec(CMenuTarget* parent, const std::string & actionKey) = 0; + virtual std::string &getValue(void) { return *valueString; } + virtual fb_pixel_t getColor(void) { return 0; } +}; + + +#endif /*__MENU_TARGET__*/