Merge with changes from Zaba999 fork.

1 files changed, 10 insertions, 5 deletions

diff --git a/src/ui/image.h b/src/ui/image.h
index 85c5962..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
@@ -21,25 +22,28 @@
 
 #include "ui/control.h"
 
-
-class CD3DEngine;
+namespace Gfx{
+class CEngine;
+};
 
 
+namespace Ui {
 
 class CImage : public CControl
 {
 public:
-    CImage(CInstanceManager* iMan);
+//    CImage(CInstanceManager* iMan);
+    CImage ();
     virtual ~CImage();
 
-    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);
 
     void    Draw();
 
     void    SetFilenameImage(char *name);
-    char*   RetFilenameImage();
+    char*   GetFilenameImage();
 
 protected:
 
@@ -48,3 +52,4 @@ protected:
 };
 
 
+}