From d59cd9111c1e86b224ea62cc975c49b157e2b3cf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 19 Oct 2012 23:56:04 +0300 Subject: Add to some controls palette inheritance from other controls. --- src/gui/charselectdialog.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/gui/charselectdialog.cpp') 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(mLoginData->characterSlots); i++) { - mCharacterEntries.push_back(new CharacterDisplay(this)); + mCharacterEntries.push_back(new CharacterDisplay(this, this)); placer(i % SLOTS_PER_ROW, static_cast(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")), -- cgit v1.2.3-60-g2f50