diff options
author | erihel <erihel@gmail.com> | 2012-08-21 20:55:03 +0200 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2012-08-21 20:55:03 +0200 |
commit | 4faa1b9c447485cd2086a4c7f7c3655042e5de83 (patch) | |
tree | 6b4b059b5129554df5596e0ad198501213b02957 /src/ui/image.h | |
parent | 75a76e82529f9726772bff066748e764f88c6d85 (diff) | |
parent | 199768280816d56a3356a6c3d137df0a73dba62b (diff) | |
download | colobot-4faa1b9c447485cd2086a4c7f7c3655042e5de83.tar.gz colobot-4faa1b9c447485cd2086a4c7f7c3655042e5de83.tar.bz2 colobot-4faa1b9c447485cd2086a4c7f7c3655042e5de83.zip |
merged changes from michkon
Diffstat (limited to 'src/ui/image.h')
-rw-r--r-- | src/ui/image.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/ui/image.h b/src/ui/image.h index b6b88c3..f24684a 100644 --- a/src/ui/image.h +++ b/src/ui/image.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,30 @@ #pragma once -#include <ui/control.h> +#include "ui/control.h" -#include <common/event.h> - -class CD3DEngine; +namespace Gfx{ +class CEngine; +}; +namespace Ui { class CImage : public CControl { public: - CImage(); +// CImage(CInstanceManager* iMan); + CImage (); virtual ~CImage(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); bool EventProcess(const Event &event); void Draw(); void SetFilenameImage(char *name); - char* RetFilenameImage(); + char* GetFilenameImage(); protected: @@ -49,3 +52,4 @@ protected: }; +} |