diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-15 23:32:28 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-15 23:37:32 +0200 |
| commit | fe25bc152de747eb64a1c1f6084f0399faf125e8 (patch) | |
| tree | 83746ebff16b87ad36c71908667ed1a81489ebe6 /src/gui/login.cpp | |
| parent | ddd7f8acbbfbe7cf2787279babdb5c1279c7fd73 (diff) | |
| download | Mana-fe25bc152de747eb64a1c1f6084f0399faf125e8.tar.gz Mana-fe25bc152de747eb64a1c1f6084f0399faf125e8.tar.bz2 Mana-fe25bc152de747eb64a1c1f6084f0399faf125e8.tar.xz Mana-fe25bc152de747eb64a1c1f6084f0399faf125e8.zip | |
Have the DropDown create its ScrollArea and ListBox
And also clean them up again. Fixes some memory leaks and simplifies the
code. Also got rid of the basically unused "opaque" setting of DropDown.
Diffstat (limited to 'src/gui/login.cpp')
| -rw-r--r-- | src/gui/login.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/gui/login.cpp b/src/gui/login.cpp index d9f31b95..92c6050c 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -28,9 +28,7 @@ #include "gui/widgets/dropdown.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" -#include "gui/widgets/listbox.h" #include "gui/widgets/passwordfield.h" -#include "gui/widgets/scrollarea.h" #include "gui/widgets/textfield.h" #include "main.h" @@ -61,8 +59,6 @@ LoginDialog::LoginDialog(LoginData *loginData): dfltPort.push_back("6901"); mServerList = new DropDownList("MostRecent00", dfltServer, dfltPort, MAX_SERVER_LIST_SIZE); - mServerListBox = new ListBox(mServerList); - mServerScrollArea = new ScrollArea; #endif mUserField = new TextField(mLoginData->username); @@ -70,10 +66,7 @@ LoginDialog::LoginDialog(LoginData *loginData): #ifdef EATHENA_SUPPORT mServerField = new TextField(mServerList->getServerAt(0)); mPortField = new TextField(mServerList->getPortAt(0)); - mServerDropDown = new DropDown(mServerList, - mServerScrollArea, - mServerListBox); - mServerDropDown->setOpaque(false); + mServerDropDown = new DropDown(mServerList); #endif mKeepCheck = new CheckBox(_("Remember Username"), mLoginData->remember); @@ -161,7 +154,7 @@ void LoginDialog::action(const gcn::ActionEvent &event) #ifdef EATHENA_SUPPORT else if (event.getId() == "changeSelection") { - int selected = mServerListBox->getSelected(); + int selected = mServerDropDown->getSelected(); mServerField->setText(mServerList->getServerAt(selected)); mPortField->setText(mServerList->getPortAt(selected)); } |