Changed the tabbedarea to be transparant as before. Changed setup

        window and skills dialog to use the new tabbed area. Removed tabbed
        container as it is no longer used. Fixed a crash with the chat window.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index b69cb9f1..d1f8a38a 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -30,7 +30,8 @@
 #include "setup_joystick.h"
 #include "setup_video.h"
 #include "setup_keyboard.h"
-#include "tabbedcontainer.h"
+
+#include "widgets/tabbedarea.h"
 
 #include "../utils/dtor.h"
 #include "../utils/gettext.h"
@@ -63,26 +64,25 @@ Setup::Setup():
         add(btn);
     }
 
-    TabbedContainer *panel = new TabbedContainer();
+    TabbedArea *panel = new TabbedArea();
     panel->setDimension(gcn::Rectangle(5, 5, 250, 205));
-    panel->setOpaque(false);
 
     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);
 
     add(panel);