From 19fa5e64181945322d7fc835fdfdde264f1d99a9 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 20 Sep 2013 08:32:02 +0200 Subject: [PATCH] CComponentsButton: remove function blocks from header --- src/gui/components/cc_frm_button.cpp | 10 ++++++++++ src/gui/components/cc_frm_button.h | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp index c43c7fe8a..56496b505 100644 --- a/src/gui/components/cc_frm_button.cpp +++ b/src/gui/components/cc_frm_button.cpp @@ -168,6 +168,16 @@ void CComponentsButton::initCaption() } } +void CComponentsButton::setCaption(const std::string& text) +{ + cc_btn_capt = text; +} + +void CComponentsButton::setCaption(const neutrino_locale_t locale_text) +{ + cc_btn_capt = g_Locale->getText(locale_text); +} + void CComponentsButton::initCCBtnItems() { initIcon(); diff --git a/src/gui/components/cc_frm_button.h b/src/gui/components/cc_frm_button.h index 8fea740b4..5c196d88e 100644 --- a/src/gui/components/cc_frm_button.h +++ b/src/gui/components/cc_frm_button.h @@ -27,7 +27,6 @@ #define __CC_BUTTONS_H__ #include -#include #include "cc.h" #include "cc_frm.h" #include @@ -85,9 +84,9 @@ class CComponentsButton : public CComponentsForm virtual void setButtonTextColor(fb_pixel_t caption_color){cc_btn_capt_col = caption_color;}; ///set caption: parameter as string - virtual void setCaption(const std::string& text){cc_btn_capt = text;}; + virtual void setCaption(const std::string& text); ///set caption: parameter as locale - virtual void setCaption(const neutrino_locale_t locale_text){cc_btn_capt = g_Locale->getText(locale_text);}; + virtual void setCaption(const neutrino_locale_t locale_text); ///reinitialize items virtual void Refresh(){initCCBtnItems();};