summaryrefslogtreecommitdiff
path: root/src/gui/widgets/icon.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-18 01:12:45 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-18 22:05:06 +0300
commitf24b4360e73d45bc0830d2964c06e295890e5f18 (patch)
tree6ce4f8440b22ec665aa94403643c6cb0df1b47f0 /src/gui/widgets/icon.cpp
parent14a0a04b2bb3928f7429fd748dd40e1843fca571 (diff)
downloadManaVerse-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.gz
ManaVerse-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.bz2
ManaVerse-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.xz
ManaVerse-f24b4360e73d45bc0830d2964c06e295890e5f18.zip
derive Widget from Widget2.
Diffstat (limited to 'src/gui/widgets/icon.cpp')
-rw-r--r--src/gui/widgets/icon.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp
index 66313d397..73607c048 100644
--- a/src/gui/widgets/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -27,9 +27,9 @@
#include "debug.h"
-Icon::Icon(const Widget2 *const widget, const std::string &file) :
- gcn::Widget(),
- Widget2(widget),
+Icon::Icon(const Widget2 *const widget,
+ const std::string &file) :
+ gcn::Widget(widget),
mImage(ResourceManager::getInstance()->getImage(file))
{
if (mImage)
@@ -39,9 +39,9 @@ Icon::Icon(const Widget2 *const widget, const std::string &file) :
}
}
-Icon::Icon(const Widget2 *const widget, Image *const image) :
- gcn::Widget(),
- Widget2(widget),
+Icon::Icon(const Widget2 *const widget,
+ Image *const image) :
+ gcn::Widget(widget),
mImage(image)
{
if (mImage)