diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-18 01:12:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-18 22:05:06 +0300 |
| commit | f24b4360e73d45bc0830d2964c06e295890e5f18 (patch) | |
| tree | 6ce4f8440b22ec665aa94403643c6cb0df1b47f0 /src/gui/widgets/label.cpp | |
| parent | 14a0a04b2bb3928f7429fd748dd40e1843fca571 (diff) | |
| download | plus-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.gz plus-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.bz2 plus-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.xz plus-f24b4360e73d45bc0830d2964c06e295890e5f18.zip | |
derive Widget from Widget2.
Diffstat (limited to 'src/gui/widgets/label.cpp')
| -rw-r--r-- | src/gui/widgets/label.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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(); |