diff options
Diffstat (limited to 'src/ui/control.h')
-rw-r--r-- | src/ui/control.h | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/ui/control.h b/src/ui/control.h index dcae4f2..95d01f6 100644 --- a/src/ui/control.h +++ b/src/ui/control.h @@ -20,22 +20,23 @@ //#include "old/text.h" -#include <common/struct.h> -#include <common/event.h> +#include "graphics/engine/text.h" +//#include "common/struct.h" +#include "common/event.h" -#include <graphics/engine/engine.h> -#include <graphics/engine/text.h> -#include <graphics/engine/particle.h> - -#include <sound/sound.h> +namespace Gfx { +class CEngine; +class CParticle; +}; -// class CEvent; +class CInstanceManager; +class CEvent; //class Gfx::CEngine; -// class CRobotMain; +class CRobotMain; //class Gfx::CParticle; -//class CSound; - +class CSoundInterface; +namespace Ui { enum ControlState { STATE_ENABLE = (1<<0), // active @@ -62,7 +63,8 @@ enum ControlState class CControl { public: - CControl(); +// CControl(CInstanceManager* iMan); + CControl (); virtual ~CControl(); virtual bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); @@ -81,7 +83,7 @@ public: virtual void SetIcon(int icon); virtual int GetIcon(); virtual void SetName(char* name, bool bTooltip=true); - virtual char* GetName(); + virtual char* GetName(); virtual void SetTextAlign(Gfx::TextAlign mode); virtual int GetTextAlign(); virtual void SetFontSize(float size); @@ -141,3 +143,4 @@ protected: }; +} |