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/label.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/label.h')
-rw-r--r-- | src/ui/label.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/ui/label.h b/src/ui/label.h index d3cb915..6fe2e31 100644 --- a/src/ui/label.h +++ b/src/ui/label.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 @@ -19,28 +20,24 @@ #pragma once -#include "ui/control.h" - - -class CD3DEngine; +#include <ui/control.h> +#include <common/event.h> +#include <common/misc.h> +namespace Ui { class CLabel : public CControl { -public: - CLabel(CInstanceManager* iMan); - virtual ~CLabel(); - - bool Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - - bool EventProcess(const Event &event); - - void Draw(); + public: + CLabel(); + virtual ~CLabel(); -protected: + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + bool EventProcess(const Event &event); -protected: + void Draw(); }; +} |