diff options
author | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-18 22:56:42 +0200 |
---|---|---|
committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-18 22:56:42 +0200 |
commit | 574c07e388dfd902b6565bc4a5ac9b915c73074e (patch) | |
tree | 65846a6bd77542a5e7271ff8cc4bfa77bda477a5 /src/ui/control.h | |
parent | 10b2c562fb7635f9850f1441f08ba8b1a71e31e1 (diff) | |
download | colobot-574c07e388dfd902b6565bc4a5ac9b915c73074e.tar.gz colobot-574c07e388dfd902b6565bc4a5ac9b915c73074e.tar.bz2 colobot-574c07e388dfd902b6565bc4a5ac9b915c73074e.zip |
Further improvements in UI porting
Diffstat (limited to 'src/ui/control.h')
-rw-r--r-- | src/ui/control.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/ui/control.h b/src/ui/control.h index b211ff6..95d01f6 100644 --- a/src/ui/control.h +++ b/src/ui/control.h @@ -20,20 +20,23 @@ //#include "old/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 "common/struct.h" +#include "common/event.h" + +namespace Gfx { +class CEngine; +class CParticle; +}; class CInstanceManager; class CEvent; //class Gfx::CEngine; class CRobotMain; //class Gfx::CParticle; -class CSound; - +class CSoundInterface; +namespace Ui { enum ControlState { STATE_ENABLE = (1<<0), // active @@ -60,7 +63,8 @@ enum ControlState class CControl { public: - CControl(CInstanceManager* iMan); +// CControl(CInstanceManager* iMan); + CControl (); virtual ~CControl(); virtual bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); @@ -114,7 +118,7 @@ protected: CEventQueue* m_event; CRobotMain* m_main; Gfx::CParticle* m_particle; - CSound* m_sound; + CSoundInterface* m_sound; Math::Point m_pos; // corner upper / left Math::Point m_dim; // dimensions @@ -139,3 +143,4 @@ protected: }; +} |