diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-20 02:23:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-20 13:55:43 +0300 |
| commit | 0153e8fa499b7bbdd712339bfb3921ead15a37a2 (patch) | |
| tree | 0e12bc130aa40d3bc41f86e16754f060b450977e /src/gui/widgets/label.cpp | |
| parent | 4c7a11b639ec94c8a32a9a52e99652c464745037 (diff) | |
| download | manaplus-0153e8fa499b7bbdd712339bfb3921ead15a37a2.tar.gz manaplus-0153e8fa499b7bbdd712339bfb3921ead15a37a2.tar.bz2 manaplus-0153e8fa499b7bbdd712339bfb3921ead15a37a2.tar.xz manaplus-0153e8fa499b7bbdd712339bfb3921ead15a37a2.zip | |
Add palette inheritance to label class.
Diffstat (limited to 'src/gui/widgets/label.cpp')
| -rw-r--r-- | src/gui/widgets/label.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index 63a3f6b76..e7481e992 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -30,15 +30,17 @@ Skin *Label::mSkin = nullptr; int Label::mInstances = 0; -Label::Label() : +Label::Label(const Widget2 *const widget) : gcn::Label(), + Widget2(widget), mPadding(0) { init(); } -Label::Label(const std::string &caption) : +Label::Label(const Widget2 *const widget, const std::string &caption) : gcn::Label(caption), + Widget2(widget), mPadding(0) { init(); |