2 files changed, 20 insertions, 5 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 3c48986a..bd600654 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -14,8 +14,8 @@ Setup::Setup(gcn::Container *parent)
   : Window(parent, "Setup")
 {
   displayLabel = new gcn::Label("Display");
-  applyButton = new gcn::Button("Apply");
-  cancelButton = new gcn::Button("Cancel");
+  applyButton = new Button("Apply");
+  cancelButton = new Button("Cancel");
   
   /* Set dimension */
   displayLabel->setDimension(gcn::Rectangle(0,0,80, 16));
diff --git a/src/gui/setup.h b/src/gui/setup.h
index b6b83717..55e66cc5 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -13,13 +13,28 @@
 #include <winalleg.h>
 #endif
 
+
+/*
+ * The list model for modes list
+ */
+class ModesListModel : public gcn::ListModel {
+ public:
+  int getNumberOfElements();
+  std::string getElementAt(int i);
+};
+
+/* 
+ * Setup dialog window
+ */
 class Setup : public Window, public gcn::ActionListener {
  private:
   /* Dialog parts */
+  ModesListModel *modesListModel;
   gcn::Label *displayLabel;
-  gcn::Button *applyButton;
-  gcn::Button *cancelButton;
-
+  gcn::ListBox *modeslist;
+  Button *applyButton;
+  Button *cancelButton;
+  
   /* Setup dialog */
   static Setup *ptr;