1 files changed, 31 insertions, 6 deletions

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 76e3936c2..ae7a3109c 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -51,7 +51,7 @@
 extern Window *statusWindow;
 
 Setup::Setup():
-    Window(_("Setup"))
+    Window(_("Setup"), false, 0, "setup.xml")
 {
     setCloseButton(true);
     setResizable(true);
@@ -103,7 +103,8 @@ Setup::Setup():
     mTabs.push_back(new Setup_Theme);
     mTabs.push_back(new Setup_Other);
 
-    for (std::list<SetupTab*>::iterator i = mTabs.begin(), i_end = mTabs.end();
+    for (std::list<SetupTab*>::const_iterator i = mTabs.begin(),
+         i_end = mTabs.end();
          i != i_end; ++i)
     {
         SetupTab *tab = *i;
@@ -162,10 +163,11 @@ void Setup::action(const gcn::ActionEvent &event)
         if (!statusWindow)
             return;
 
-        for (std::list<Window*>::iterator it = mWindowsToReset.begin();
+        for (std::list<Window*>::const_iterator it = mWindowsToReset.begin();
              it != mWindowsToReset.end(); ++it)
         {
-            (*it)->resetToDefaultSize();
+            if (*it)
+                (*it)->resetToDefaultSize();
         }
     }
 }
@@ -177,10 +179,11 @@ void Setup::setInGame(bool inGame)
 
 void Setup::externalUpdate()
 {
-    for (std::list<SetupTab*>::iterator it = mTabs.begin();
+    for (std::list<SetupTab*>::const_iterator it = mTabs.begin();
          it != mTabs.end(); ++it)
     {
-        (*it)->externalUpdated();
+        if (*it)
+            (*it)->externalUpdated();
     }
 }
 
@@ -195,4 +198,26 @@ void Setup::doCancel()
     for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::cancel));
 }
 
+void Setup::activateTab(const std::string &name)
+{
+    std::string tmp = gettext(name.c_str());
+    mPanel->setSelectedTab(tmp);
+/*
+    for (std::list<SetupTab*>::const_iterator it = mTabs.begin();
+         it != mTabs.end(); ++it)
+    {
+        if (*it)
+        {
+            SetupTab *tab = *it;
+            logger->log("check tab: " + tab->getName());
+            if (tab->getName() == tmp)
+            {
+                mPanel->setSelectedTab(name);
+                return;
+            }
+        }
+    }
+*/
+}
+
 Setup *setupWindow;