diff options
author | Piotr Dziwiński <piotrdz@gmail.com> | 2012-09-13 09:09:41 -0700 |
---|---|---|
committer | Piotr Dziwiński <piotrdz@gmail.com> | 2012-09-13 09:09:41 -0700 |
commit | e9fcec9de52471508933c9d90cc6041ce0af9752 (patch) | |
tree | 81d0674e4b54e95dad5508948491a26d9d5522da /src/ui/shortcut.h | |
parent | 8b2bca72dd71a1c23db51269a147443c80758f10 (diff) | |
parent | 01cc0fbc49696a19a56dfdd8359d4bb77e868925 (diff) | |
download | colobot-e9fcec9de52471508933c9d90cc6041ce0af9752.tar.gz colobot-e9fcec9de52471508933c9d90cc6041ce0af9752.tar.bz2 colobot-e9fcec9de52471508933c9d90cc6041ce0af9752.zip |
Merge pull request #45 from Erihel/dev-ui
Changes from dev-ui in erihel's fork
Diffstat (limited to 'src/ui/shortcut.h')
-rw-r--r-- | src/ui/shortcut.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/ui/shortcut.h b/src/ui/shortcut.h index b918ccc..9ee97e0 100644 --- a/src/ui/shortcut.h +++ b/src/ui/shortcut.h @@ -1,5 +1,6 @@ // * This file is part of the COLOBOT source code // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) // * // * This program is free software: you can redistribute it and/or modify // * it under the terms of the GNU General Public License as published by @@ -18,31 +19,30 @@ #pragma once +#include <ui/control.h> -#include "ui/control.h" - - -class CD3DEngine; - +#include <common/event.h> +namespace Ui { 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 eventType); - 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; }; +} |