Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Origin commit data
------------------
Commit: 09559c1385
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-04 (Mon, 04 Dec 2017)
This commit is contained in:
vanhofen
2017-12-04 09:55:06 +01:00

View File

@@ -141,9 +141,9 @@ class CComponentsPicture : public CComponentsItem
}
///sets an image name (unscaled icons only), full image path or url to an image file
virtual void setPicture(const std::string& picture_name);
void setPicture(const std::string& picture_name);
///sets an image name (unscaled icons only), full image path or url to an image file
virtual void setPicture(const char* picture_name);
void setPicture(const char* picture_name);
///returns current assigned image name
std::string getPictureName(){return pic_name;}