From 10b2c562fb7635f9850f1441f08ba8b1a71e31e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Wed, 15 Aug 2012 01:48:49 +0200 Subject: First approach to port 2D UI Interface - changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs - necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile --- src/ui/color.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/ui/color.h') diff --git a/src/ui/color.h b/src/ui/color.h index 41052a7..151a4df 100644 --- a/src/ui/color.h +++ b/src/ui/color.h @@ -20,10 +20,10 @@ #include "ui/control.h" -#include "old/d3dengine.h" +//#include "graphics/engine/engine.h" -class CD3DEngine; +//class CEngine; @@ -33,24 +33,24 @@ public: CColor(CInstanceManager* iMan); virtual ~CColor(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); bool EventProcess(const Event &event); void Draw(); void SetRepeat(bool bRepeat); - bool RetRepeat(); + bool GetRepeat(); - void SetColor(D3DCOLORVALUE color); - D3DCOLORVALUE RetColor(); + void SetColor(Gfx::Color color); + Gfx::Color GetColor(); protected: protected: - bool m_bRepeat; - float m_repeat; - D3DCOLORVALUE m_color; + bool m_bRepeat; + float m_repeat; + Gfx::Color m_color; }; -- cgit v1.2.3-1-g7c22