From 01cc0fbc49696a19a56dfdd8359d4bb77e868925 Mon Sep 17 00:00:00 2001 From: erihel Date: Tue, 11 Sep 2012 12:49:41 +0200 Subject: * latest changes * all files except studio, map and maindialog should compile * did some code cleanup --- src/ui/color.h | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'src/ui/color.h') 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; + }; } -- cgit v1.2.3-1-g7c22