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.

1 files changed, 16 insertions, 19 deletions

diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 77e726f8..02955470 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -19,29 +19,26 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <string>
-#include <cmath>
-
-#include <guichan/listmodel.hpp>
-#include <guichan/widgets/slider.hpp>
+#include "gui/browserbox.h"
+#include "gui/gui.h"
+#include "gui/itemlinkhandler.h"
+#include "gui/label.h"
+#include "gui/listbox.h"
+#include "gui/palette.h"
+#include "gui/scrollarea.h"
+#include "gui/setup_colors.h"
+#include "gui/slider.h"
 
-#include "browserbox.h"
-#include "gui.h"
-#include "itemlinkhandler.h"
-#include "label.h"
-#include "listbox.h"
-#include "palette.h"
-#include "scrollarea.h"
-#include "setup_colors.h"
-#include "slider.h"
-#include "textfield.h"
+#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/textpreview.h"
 
-#include "widgets/layouthelper.h"
+#include "configuration.h"
 
-#include "../configuration.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
 
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+#include <string>
+#include <cmath>
 
 const std::string Setup_Colors::rawmsg = _("This is what the color looks like");