diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-20 02:53:30 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-20 13:55:43 +0300 |
| commit | 4f20c92940b9cbb8e87d0765860a81eb3f7d2733 (patch) | |
| tree | 94bb2372a80b65e39751ddac3bcfb861beb837af /src/gui/widgets | |
| parent | 015b14f8e60d64da2999da9c753af62ec1ffdf72 (diff) | |
| download | manaplus-4f20c92940b9cbb8e87d0765860a81eb3f7d2733.tar.gz manaplus-4f20c92940b9cbb8e87d0765860a81eb3f7d2733.tar.bz2 manaplus-4f20c92940b9cbb8e87d0765860a81eb3f7d2733.tar.xz manaplus-4f20c92940b9cbb8e87d0765860a81eb3f7d2733.zip | |
Add palette inheritance to textbox class.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/shoplistbox.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/textbox.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/textbox.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index b81e3aced..13a2eb822 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -45,7 +45,7 @@ const int ITEM_ICON_SIZE = 32; float ShopListBox::mAlpha = 1.0; ShopListBox::ShopListBox(const Widget2 *const widget, - gcn::ListModel *const listModel) : + gcn::ListModel *const listModel) : ListBox(widget, listModel), mPlayerMoney(0), mShopItems(nullptr), diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index 017c0f2a2..4f90a6841 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -33,9 +33,9 @@ #include "debug.h" -TextBox::TextBox() : +TextBox::TextBox(const Widget2 *const widget) : gcn::TextBox(), - Widget2(), + Widget2(widget), mMinWidth(getWidth()) { mForegroundColor = getThemeColor(Theme::TEXTBOX); diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 335ef777a..73de248cf 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -43,7 +43,7 @@ class TextBox final : public gcn::TextBox, /** * Constructor. */ - TextBox(); + TextBox(const Widget2 *const widget); A_DELETE_COPY(TextBox) |