Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 10 insertions, 8 deletions

diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h
index 79afe122..57d9e304 100644
--- a/src/gui/setup_colours.h
+++ b/src/gui/setup_colours.h
@@ -23,19 +23,19 @@
 #define SETUP_COLOURS_H
 
 #include <string>
-#include <vector>
 
 #include <guichan/actionlistener.hpp>
+
 #include <guichan/widgets/label.hpp>
 #include <guichan/widgets/listbox.hpp>
 
-#include "scrollarea.h"
 #include "setuptab.h"
-#include "slider.h"
 #include "textfield.h"
 
 #include "../guichanfwd.h"
 
+class BrowserBox;
+
 class Setup_Colours : public SetupTab, public gcn::ActionListener,
                       public TextFieldListener
 {
@@ -49,25 +49,27 @@ class Setup_Colours : public SetupTab, public gcn::ActionListener,
         void listen(const TextField *tf);
     private:
         gcn::ListBox *mColourBox;
-        ScrollArea *mScroll;
+        gcn::ScrollArea *mScroll;
+        BrowserBox *mPreview;
+        gcn::ScrollArea *mPreviewBox;
         int mSelected;
 
         gcn::Label *mRedLabel;
-        Slider *mRedSlider;
+        gcn::Slider *mRedSlider;
         TextField *mRedText;
         int mRedValue;
 
         gcn::Label *mGreenLabel;
-        Slider *mGreenSlider;
+        gcn::Slider *mGreenSlider;
         TextField *mGreenText;
         int mGreenValue;
 
         gcn::Label *mBlueLabel;
-        Slider *mBlueSlider;
+        gcn::Slider *mBlueSlider;
         TextField *mBlueText;
         int mBlueValue;
 
-        void setEntry(Slider *s, TextField *t, int value);
+        void setEntry(gcn::Slider *s, TextField *t, int value);
         void updateColour();
 };
 #endif