Merge branch 'dev'

Merging content from dev

1 files changed, 19 insertions, 22 deletions

diff --git a/src/ui/color.h b/src/ui/color.h
index 311a532..ec2c537 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -23,37 +23,34 @@
 
 
 namespace Gfx{
-    class CEngine;
-    struct Color;
+class CEngine;
+struct Color;
 }
 
 namespace Ui {
-    class CColor : public CControl
-    {
-    public:
-    //    CColor(CInstanceManager* iMan);
-        CColor();
-        virtual   ~CColor();
 
-        bool      Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
+class CColor : public CControl
+{
+public:
+    CColor();
+    virtual   ~CColor();
 
-        bool      EventProcess(const Event &event);
+    bool      Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
 
-        void      Draw();
+    bool      EventProcess(const Event &event);
 
-        void      SetRepeat(bool bRepeat);
-        bool      GetRepeat();
+    void      Draw();
 
-        void       SetColor(Gfx::Color color);
-        Gfx::Color GetColor();
+    void      SetRepeat(bool bRepeat);
+    bool      GetRepeat();
 
-    protected:
-
-    protected:
-        bool           m_bRepeat;
-        float          m_repeat;
-        Gfx::Color     m_color;
-    };
+    void       SetColor(Gfx::Color color);
+    Gfx::Color GetColor();
 
+protected:
+    bool           m_bRepeat;
+    float          m_repeat;
+    Gfx::Color     m_color;
+};
 
 }