summaryrefslogtreecommitdiff
path: root/src/gui/charselectdialog.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-19 23:56:04 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-20 13:55:42 +0300
commitd59cd9111c1e86b224ea62cc975c49b157e2b3cf (patch)
treed7186479633c0269573e92b5a5213d04b84b3995 /src/gui/charselectdialog.cpp
parent71d2b482d84246b8456ea863f94a9a766d33f197 (diff)
downloadmv-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.gz
mv-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.bz2
mv-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.xz
mv-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.zip
Add to some controls palette inheritance from other controls.
Diffstat (limited to 'src/gui/charselectdialog.cpp')
-rw-r--r--src/gui/charselectdialog.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index e778cd921..06997bc34 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -96,7 +96,8 @@ class CharDeleteConfirm final : public ConfirmDialog
class CharacterDisplay final : public Container
{
public:
- CharacterDisplay(CharSelectDialog *const charSelectDialog);
+ CharacterDisplay(const Widget2 *const widget,
+ CharSelectDialog *const charSelectDialog);
A_DELETE_COPY(CharacterDisplay)
@@ -184,7 +185,7 @@ CharSelectDialog::CharSelectDialog(LoginData *const data):
for (int i = 0; i < static_cast<int>(mLoginData->characterSlots); i++)
{
- mCharacterEntries.push_back(new CharacterDisplay(this));
+ mCharacterEntries.push_back(new CharacterDisplay(this, this));
placer(i % SLOTS_PER_ROW, static_cast<int>(i) / SLOTS_PER_ROW,
mCharacterEntries[i]);
}
@@ -555,8 +556,9 @@ bool CharSelectDialog::selectByName(const std::string &name,
}
-CharacterDisplay::CharacterDisplay(CharSelectDialog *const charSelectDialog) :
- Container(),
+CharacterDisplay::CharacterDisplay(const Widget2 *const widget,
+ CharSelectDialog *const charSelectDialog) :
+ Container(widget),
mCharacter(nullptr),
mPlayerBox(new PlayerBox(nullptr)),
mName(new Label("wwwwwwwwwwwwwwwwwwwwwwww")),