diff options
author | erihel <erihel@gmail.com> | 2012-09-11 12:49:41 +0200 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2012-09-11 12:49:41 +0200 |
commit | 01cc0fbc49696a19a56dfdd8359d4bb77e868925 (patch) | |
tree | 81d0674e4b54e95dad5508948491a26d9d5522da /src/ui/color.h | |
parent | 5903e400d476c2cf62c146643a0693c4fc29d68a (diff) | |
download | colobot-01cc0fbc49696a19a56dfdd8359d4bb77e868925.tar.gz colobot-01cc0fbc49696a19a56dfdd8359d4bb77e868925.tar.bz2 colobot-01cc0fbc49696a19a56dfdd8359d4bb77e868925.zip |
* latest changes
* all files except studio, map and maindialog should compile
* did some code cleanup
Diffstat (limited to 'src/ui/color.h')
-rw-r--r-- | src/ui/color.h | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/src/ui/color.h b/src/ui/color.h index 2666f94..c282429 100644 --- a/src/ui/color.h +++ b/src/ui/color.h @@ -20,41 +20,40 @@ #pragma once -#include "ui/control.h" -//#include "graphics/engine/engine.h" +#include "control.h" namespace Gfx{ -class CEngine; -struct Color; + class CEngine; + struct Color; } namespace Ui { -class CColor : public CControl -{ -public: -// CColor(CInstanceManager* iMan); - CColor(); - virtual ~CColor(); + class CColor : public CControl + { + public: + // CColor(CInstanceManager* iMan); + CColor(); + virtual ~CColor(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event); - void Draw(); + void Draw(); - void SetRepeat(bool bRepeat); - bool GetRepeat(); + void SetRepeat(bool bRepeat); + bool GetRepeat(); - void SetColor(Gfx::Color color); - Gfx::Color GetColor(); + void SetColor(Gfx::Color color); + Gfx::Color GetColor(); -protected: + protected: -protected: - bool m_bRepeat; - float m_repeat; - Gfx::Color m_color; -}; + protected: + bool m_bRepeat; + float m_repeat; + Gfx::Color m_color; + }; } |