From f24b4360e73d45bc0830d2964c06e295890e5f18 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 18 Feb 2014 01:12:45 +0300 Subject: derive Widget from Widget2. --- src/gui/widgets/progressbar.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/gui/widgets/progressbar.cpp') 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), -- cgit v1.2.3-60-g2f50