Used custom widgets where appropriate and some cleanup

Replaced many gcn::Label with Label, gcn::Slider with Slider in
character creation dialog. Also cleaned up includes.

5 files changed, 6 insertions, 23 deletions

diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp
index 2603e3ae..c9e8002e 100644
--- a/src/gui/widgets/avatar.cpp
+++ b/src/gui/widgets/avatar.cpp
@@ -22,12 +22,11 @@
 #include "gui/widgets/avatar.h"
 
 #include "gui/icon.h"
+#include "gui/label.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
-#include <guichan/widgets/label.hpp>
-
 namespace {
     Image *avatarStatusOffline;
     Image *avatarStatusOnline;
@@ -54,7 +53,7 @@ Avatar::Avatar(const std::string &name):
     mStatus->setSize(12, 12);
     add(mStatus, 1, 0);
 
-    mLabel = new gcn::Label(name);
+    mLabel = new Label(name);
     mLabel->setSize(85, 12);
     add(mLabel, 14, 0);
 }
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 88d62076..2211eb36 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -40,6 +40,8 @@
 #include "utils/strprintf.h"
 #include "utils/stringutils.h"
 
+#include <guichan/widgets/tabbedarea.hpp>
+
 ChatTab::ChatTab(const std::string &name) : Tab()
 {
     setCaption(name);
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 88443aa3..ad7c90bb 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -25,8 +25,6 @@
 #include "gui/widgets/tab.h"
 #include "gui/chat.h"
 
-#include <guichan/widgets/container.hpp>
-
 class BrowserBox;
 class Recorder;
 class ScrollArea;
@@ -60,10 +58,6 @@ class ChatTab : public Tab
          * Constructor.
          */
         ChatTab(const std::string &name);
-
-        /**
-         * Destructor.
-         */
         ~ChatTab();
 
         /**
@@ -81,7 +75,6 @@ class ChatTab : public Tab
          * Adds the text to the message list
          *
          * @param msg  The message text which is to be sent.
-         *
          */
         void chatLog(const std::string &nick, const std::string &msg);
 
@@ -91,7 +84,6 @@ class ChatTab : public Tab
          * command handler
          *
          * @param msg  The message text which is to be sent.
-         *
          */
         void chatInput(std::string &msg);
 
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 3c95eb26..456735c4 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -41,8 +41,8 @@ float Tab::mAlpha = 1.0;
 enum {
     TAB_STANDARD,    // 0
     TAB_HIGHLIGHTED, // 1
-    TAB_SELECTED,     // 2
-    TAB_UNUSED,       // 3
+    TAB_SELECTED,    // 2
+    TAB_UNUSED,      // 3
     TAB_COUNT        // 4 - Must be last.
 };
 
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index efdc8d26..271316e4 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -23,7 +23,6 @@
 #define TAB_H
 
 #include <guichan/widgets/tab.hpp>
-#include <guichan/widgets/tabbedarea.hpp>
 
 class ImageRect;
 class TabbedArea;
@@ -34,14 +33,7 @@ class TabbedArea;
 class Tab : public gcn::Tab
 {
     public:
-        /**
-         * Constructor.
-         */
         Tab();
-
-        /**
-         * Destructor.
-         */
         ~Tab();
 
         /**
@@ -76,5 +68,3 @@ class Tab : public gcn::Tab
 };
 
 #endif
-
-