diff options
author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-10 23:29:38 +0200 |
---|---|---|
committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-10 23:29:38 +0200 |
commit | 479a67a731be5a5e8035ea7acce0344c7c605814 (patch) | |
tree | fc0448b4095ce03aeca2a1be98418aae78751d84 /src/ui/shortcut.h | |
parent | cf2295d08d0b2d0ba63e316f5e5e3615c5c978ac (diff) | |
download | colobot-479a67a731be5a5e8035ea7acce0344c7c605814.tar.gz colobot-479a67a731be5a5e8035ea7acce0344c7c605814.tar.bz2 colobot-479a67a731be5a5e8035ea7acce0344c7c605814.zip |
Merge with changes from Zaba999 fork.
Diffstat (limited to 'src/ui/shortcut.h')
-rw-r--r-- | src/ui/shortcut.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/ui/shortcut.h b/src/ui/shortcut.h index b918ccc..d819bf2 100644 --- a/src/ui/shortcut.h +++ b/src/ui/shortcut.h @@ -18,31 +18,28 @@ #pragma once +#include <ui/control.h> -#include "ui/control.h" - - -class CD3DEngine; - +#include <common/event.h> class CShortcut : public CControl { -public: - CShortcut(CInstanceManager* iMan); - ~CShortcut(); + public: + CShortcut(); + ~CShortcut(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event); - void Draw(); + void Draw(); -protected: - void DrawVertex(int icon, float zoom); + protected: + void DrawVertex(int icon, float zoom); -protected: - float m_time; + protected: + float m_time; }; |