From a9a8d29f6244913fa7dba7530f851fd115c17083 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 14 Apr 2015 11:30:15 +0200 Subject: [PATCH] CComponentsText: declare function getTextFromFile() as static Is usable as standalone member too. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/884e3b7cb5be98cb2fdd7ee79bb8988ef75b3e3e Author: Thilo Graf Date: 2015-04-14 (Tue, 14 Apr 2015) ------------------ This commit was generated by Migit --- src/gui/components/cc_item_text.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/components/cc_item_text.h b/src/gui/components/cc_item_text.h index 96307f2b7..0b89f2b1a 100644 --- a/src/gui/components/cc_item_text.h +++ b/src/gui/components/cc_item_text.h @@ -146,7 +146,7 @@ class CComponentsText : public CComponentsItem, public CBox ///set text directly from a textfile, path as string is required virtual bool setTextFromFile(const std::string& path_to_textfile, const int mode = ~CTextBox::AUTO_WIDTH, Font* font_text = NULL, const fb_pixel_t& color_text = 0, const int& style = FONT_STYLE_REGULAR); ///get text directly from a textfile, path as string is required - virtual std::string getTextFromFile(const std::string& path_to_textfile); + static std::string getTextFromFile(const std::string& path_to_textfile); ///returns current text content of text/label object as std::string virtual std::string getText(){return ct_text;};