1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 551fe5bb..bd5a25f9 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -30,7 +30,8 @@
 #include "setup_keyboard.h"
 #include "setup_players.h"
 #include "setup_video.h"
-#include "tabbedcontainer.h"
+
+#include "widgets/tabbedarea.h"
 
 #include "../utils/dtor.h"
 #include "../utils/gettext.h"
@@ -48,7 +49,7 @@ extern Window *emoteWindow;
 extern Window *tradeWindow;
 
 Setup::Setup():
-    Window("Setup")
+    Window(_("Setup"))
 {
     setCloseButton(true);
     int width = 310;
@@ -71,34 +72,33 @@ Setup::Setup():
             btn->setEnabled(statusWindow != NULL);
     }
 
-    TabbedContainer *panel = new TabbedContainer(width, 5, 20, 45, 5, 3);
-    panel->setDimension(gcn::Rectangle(5, 5, width, height - 40));
-    panel->setOpaque(false);
+    TabbedArea *panel = new TabbedArea();
+    panel->setDimension(gcn::Rectangle(5, 5, width - 10, height - 40));
 
     SetupTab *tab;
 
     tab = new Setup_Video();
-    panel->addTab(tab, _("Video"));
+    panel->addTab(_("Video"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Audio();
-    panel->addTab(tab, _("Audio"));
+    panel->addTab(_("Audio"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Joystick();
-    panel->addTab(tab, _("Joystick"));
+    panel->addTab(_("Joystick"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Keyboard();
-    panel->addTab(tab, _("Keyboard"));
+    panel->addTab(_("Keyboard"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Colours();
-    panel->addTab(tab, _("Colors"));
+    panel->addTab(_("Colors"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Players();
-    panel->addTab(tab, _("Players"));
+    panel->addTab(_("Players"), tab);
     mTabs.push_back(tab);
 
     add(panel);