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/label.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/gui/widgets/label.cpp') diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index 6cc94cc3d..73e3bca64 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -29,16 +29,15 @@ Skin *Label::mSkin = nullptr; int Label::mInstances = 0; Label::Label(const Widget2 *const widget) : - gcn::Label(), - Widget2(widget), + gcn::Label(widget), mPadding(0) { init(); } -Label::Label(const Widget2 *const widget, const std::string &caption) : - gcn::Label(caption), - Widget2(widget), +Label::Label(const Widget2 *const widget, + const std::string &caption) : + gcn::Label(widget, caption), mPadding(0) { init(); -- cgit v1.2.3-60-g2f50