diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-20 15:12:26 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-20 15:12:26 +0200 |
| commit | 7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a (patch) | |
| tree | e1df82b6fcf9ce34c01b1b06674516747578ef3e /src/ui/label.h | |
| parent | 8666d35f7c3129c101029eae1cd0a5124f35b7de (diff) | |
| parent | 8d4a3ed57915af2acf8b3dcd9a8aec5a75806ca6 (diff) | |
| download | colobot-7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a.tar.gz colobot-7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a.tar.bz2 colobot-7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a.zip | |
Merge remote-tracking branch 'erihel/dev-ui' into dev-ui
Conflicts:
src/ui/button.h
src/ui/color.h
src/ui/compass.h
src/ui/control.h
src/ui/displayinfo.h
src/ui/displaytext.h
src/ui/edit.h
src/ui/editvalue.h
src/ui/gauge.h
src/ui/group.h
src/ui/image.h
src/ui/slider.h
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(); }; +} |