From 5d02ab43ff6d3e328a3b02479c033609023edec2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 20 Oct 2012 01:25:19 +0300 Subject: Add palette inheritance to icon class. --- src/gui/widgets/icon.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/gui/widgets/icon.cpp') diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index 4b7ab9b98..9781e978f 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -29,17 +29,18 @@ #include "debug.h" -Icon::Icon(const std::string &file) : +Icon::Icon(const Widget2 *const widget, const std::string &file) : gcn::Widget(), - Widget2(), + Widget2(widget), mImage(ResourceManager::getInstance()->getImage(file)) { if (mImage) setSize(mImage->mBounds.w, mImage->mBounds.h); } -Icon::Icon(Image *const image) : +Icon::Icon(const Widget2 *const widget, Image *const image) : gcn::Widget(), + Widget2(widget), mImage(image) { if (mImage) -- cgit v1.2.3-70-g09d2