diff options
author | erihel <erihel@gmail.com> | 2012-08-18 11:30:29 +0200 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2012-08-18 11:30:29 +0200 |
commit | 48ad79a03c12b923dfdb3795a2138445859cf779 (patch) | |
tree | 8fdffe1bc7ef2a5e1008a98a3fbb3bd1e58d4b80 /src/ui | |
parent | c02ac93379287fd83b134c34aa925c85fcda8e26 (diff) | |
download | colobot-48ad79a03c12b923dfdb3795a2138445859cf779.tar.gz colobot-48ad79a03c12b923dfdb3795a2138445859cf779.tar.bz2 colobot-48ad79a03c12b923dfdb3795a2138445859cf779.zip |
* minor changes to control.cpp to compile it without errors
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/control.cpp | 4 | ||||
-rw-r--r-- | src/ui/control.h | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/ui/control.cpp b/src/ui/control.cpp index 61fd6dd..9893fc8 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -43,9 +43,9 @@ // Object's constructor. -CControl::CControl(CInstanceManager* iMan) +CControl::CControl() { - m_iMan = iMan; + m_iMan = CInstanceManager::GetInstancePointer(); m_engine = static_cast< Gfx::CEngine* > ( m_iMan->SearchInstance(CLASS_ENGINE) ); m_event = static_cast< CEventQueue* > ( m_iMan->SearchInstance(CLASS_EVENT) ); diff --git a/src/ui/control.h b/src/ui/control.h index d336ede..dcae4f2 100644 --- a/src/ui/control.h +++ b/src/ui/control.h @@ -20,18 +20,18 @@ //#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> -#include "sound/sound.h" +#include <graphics/engine/engine.h> +#include <graphics/engine/text.h> +#include <graphics/engine/particle.h> -class CInstanceManager; -class CEvent; +#include <sound/sound.h> + +// class CEvent; //class Gfx::CEngine; -class CRobotMain; +// class CRobotMain; //class Gfx::CParticle; //class CSound; @@ -80,8 +80,8 @@ public: virtual int GetState(); virtual void SetIcon(int icon); virtual int GetIcon(); - virtual void SetName(const char* name, bool bTooltip=true); - virtual const char* GetName(); + virtual void SetName(char* name, bool bTooltip=true); + virtual char* GetName(); virtual void SetTextAlign(Gfx::TextAlign mode); virtual int GetTextAlign(); virtual void SetFontSize(float size); @@ -90,8 +90,8 @@ public: virtual float GetFontStretch(); virtual void SetFontType(Gfx::FontType font); virtual Gfx::FontType GetFontType(); - virtual bool SetTooltip(const char* name); - virtual bool GetTooltip(Math::Point pos, const char* name); + virtual bool SetTooltip(char* name); + virtual bool GetTooltip(Math::Point pos, char* name); virtual void SetFocus(bool bFocus); virtual bool GetFocus(); |