From fe25bc152de747eb64a1c1f6084f0399faf125e8 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 15 Apr 2009 23:32:28 +0200
Subject: 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.
---
 src/gui/serverdialog.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/gui/serverdialog.cpp')

diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 35bb2f50..9fb6b6a2 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -27,8 +27,6 @@
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/listbox.h"
-#include "gui/widgets/scrollarea.h"
 #include "gui/widgets/textfield.h"
 
 #include "configuration.h"
@@ -99,11 +97,7 @@ ServerDialog::ServerDialog(LoginData *loginData):
         }
     }
 
-    mMostUsedServersListBox = new ListBox(NULL);
-    mMostUsedServersListBox->setListModel(mMostUsedServersListModel);
-    mMostUsedServersScrollArea = new ScrollArea;
-    mMostUsedServersDropDown = new DropDown(mMostUsedServersListModel,
-        mMostUsedServersScrollArea, mMostUsedServersListBox);
+    mMostUsedServersDropDown = new DropDown(mMostUsedServersListModel);
 
     mOkButton = new Button(_("Ok"), "connect", this);
     mCancelButton = new Button(_("Cancel"), "cancel", this);
@@ -142,7 +136,6 @@ ServerDialog::ServerDialog(LoginData *loginData):
 ServerDialog::~ServerDialog()
 {
     delete mMostUsedServersListModel;
-    delete mMostUsedServersScrollArea;
 }
 
 void
@@ -157,7 +150,7 @@ ServerDialog::action(const gcn::ActionEvent &event)
     {
         // Change the textField Values according to new selection
         Server myServer = mMostUsedServersListModel->getServer
-            (mMostUsedServersListBox->getSelected());
+            (mMostUsedServersDropDown->getSelected());
         mServerNameField->setText(myServer.serverName);
         mPortField->setText(toString(myServer.port));
     }
-- 
cgit v1.2.3-70-g09d2