summaryrefslogtreecommitdiff
path: root/src/gui/widgets/progressbar.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/progressbar.cpp
parent14a0a04b2bb3928f7429fd748dd40e1843fca571 (diff)
downloadmanaplus-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.gz
manaplus-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.bz2
manaplus-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.xz
manaplus-f24b4360e73d45bc0830d2964c06e295890e5f18.zip
derive Widget from Widget2.
Diffstat (limited to 'src/gui/widgets/progressbar.cpp')
-rw-r--r--src/gui/widgets/progressbar.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index a1f597da8..b44b6a1a0 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -33,12 +33,14 @@
int ProgressBar::mInstances = 0;
float ProgressBar::mAlpha = 1.0;
-ProgressBar::ProgressBar(const Widget2 *const widget, float progress,
- const int width, const int height,
+ProgressBar::ProgressBar(const Widget2 *const widget,
+ float progress,
+ const int width,
+ const int height,
const int backColor,
- const std::string &skin, const std::string &skinFill):
- gcn::Widget(),
- Widget2(widget),
+ const std::string &skin,
+ const std::string &skinFill):
+ gcn::Widget(widget),
WidgetListener(),
mFillRect(),
mSkin(nullptr),