diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-10-20 01:00:19 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-10-20 13:55:43 +0300 |
commit | 79b4bbbe0ead006bec273c247eaa50c2fd585863 (patch) | |
tree | 4e4515e5623b74ae3de48fd6f5dac2b7c2a493d5 /src/gui/widgets | |
parent | 41adf71a823f475b7f12b00e06056b778311da84 (diff) | |
download | manaverse-79b4bbbe0ead006bec273c247eaa50c2fd585863.tar.gz manaverse-79b4bbbe0ead006bec273c247eaa50c2fd585863.tar.bz2 manaverse-79b4bbbe0ead006bec273c247eaa50c2fd585863.tar.xz manaverse-79b4bbbe0ead006bec273c247eaa50c2fd585863.zip |
Add palette inheritance to checkbox class.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/checkbox.cpp | 5 | ||||
-rw-r--r-- | src/gui/widgets/checkbox.h | 3 | ||||
-rw-r--r-- | src/gui/widgets/setupitem.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 71e718fed..7377a5325 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -42,11 +42,12 @@ int CheckBox::instances = 0; Skin *CheckBox::mSkin = nullptr; float CheckBox::mAlpha = 1.0; -CheckBox::CheckBox(const std::string &caption, const bool selected, +CheckBox::CheckBox(const Widget2 *const widget, + const std::string &caption, const bool selected, gcn::ActionListener *const listener, const std::string &eventId) : gcn::CheckBox(caption, selected), - Widget2(), + Widget2(widget), mHasMouse(false), mPadding(0), mImagePadding(0), diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index 4bb675f65..91c713b9e 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -44,7 +44,8 @@ class CheckBox final : public gcn::CheckBox, /** * Constructor. */ - CheckBox(const std::string &caption, bool selected = false, + CheckBox(const Widget2 *const widget, + const std::string &caption, bool selected = false, gcn::ActionListener *const listener = nullptr, const std::string &eventId = ""); diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 92cc93d6e..937ce79d2 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -209,7 +209,7 @@ SetupItemCheckBox::~SetupItemCheckBox() void SetupItemCheckBox::createControls() { load(); - mCheckBox = new CheckBox(mText, mValue != "0", mParent, mEventName); + mCheckBox = new CheckBox(this, mText, mValue != "0", mParent, mEventName); mWidget = mCheckBox; mParent->getContainer()->add1(mWidget); mParent->addControl(this); |