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

19 files changed, 830 insertions, 1255 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b998d19..a49d371 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 # CBot shared library is built separately
-add_subdirectory(CBot) 
+add_subdirectory(CBot)
 
 
 # Configure options
@@ -190,6 +190,7 @@ ${SDL_IMAGE_INCLUDE_DIR}
 ${SDLTTF_INCLUDE_DIR}
 ${PNG_INCLUDE_DIRS}
 ${OPTIONAL_INCLUDE_DIRS}
+..
 )
 
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot)
diff --git a/src/common/key.h b/src/common/key.h
index de31c09..1d03a47 100644
--- a/src/common/key.h
+++ b/src/common/key.h
@@ -29,6 +29,7 @@
 // If need arises, it can be changed to custom function or anything else
 #define KEY(x) SDLK_ ## x
 
+
 // Key modifier defined as concatenation to KMOD_...
 // If need arises, it can be changed to custom function or anything else
 #define KEY_MOD(x) KMOD_ ## x
diff --git a/src/ui/button.h b/src/ui/button.h
index d70b3d6..924a4d8 100644
--- a/src/ui/button.h
+++ b/src/ui/button.h
@@ -30,8 +30,8 @@ namespace Ui {
 class CButton : public CControl
 {
 public:
-    CButton ();
-    virtual ~CButton ();
+    CButton();
+    virtual ~CButton();
 
     bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
 
diff --git a/src/ui/displayinfo.h b/src/ui/displayinfo.h
index a405363..1eaa39b 100644
--- a/src/ui/displayinfo.h
+++ b/src/ui/displayinfo.h
@@ -20,11 +20,8 @@
 #pragma once
 
 
-//#include "common/struct.h"
-//#include "graphics/engine/engine.h"
-//#include "graphics/engine/camera.h"
-//#include "graphics/engine/particle.h"
-//#include "old/camera.h"
+#include "common/struct.h"
+#include "old/camera.h"
 
 
 class CInstanceManager;
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 50d2352..6c96501 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -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
@@ -17,55 +18,21 @@
 // interface.cpp
 
 
-#include <windows.h>
-#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "old/d3dengine.h"
-#include "old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "ui/control.h"
-#include "ui/button.h"
-#include "ui/color.h"
-#include "ui/check.h"
-#include "ui/key.h"
-#include "ui/group.h"
-#include "ui/image.h"
-#include "ui/label.h"
-#include "ui/edit.h"
-#include "ui/editvalue.h"
-#include "ui/scroll.h"
-#include "ui/slider.h"
-#include "ui/list.h"
-#include "ui/shortcut.h"
-#include "ui/compass.h"
-#include "ui/target.h"
-#include "ui/map.h"
-#include "ui/window.h"
-#include "old/camera.h"
-#include "ui/interface.h"
-
-
-
-
-// Object's constructor.
-
-CInterface::CInterface(CInstanceManager* iMan)
-{
-    int     i;
+#include <ui/interface.h>
 
-    m_iMan = iMan;
-    m_iMan->AddInstance(CLASS_INTERFACE, this);
+namespace Ui {
 
-    m_engine = (CD3DEngine*)m_iMan->SearchInstance(CLASS_ENGINE);
-    m_camera = 0;
 
-    for ( i=0 ; i<MAXCONTROL ; i++ )
+CInterface::CInterface()
+{
+    m_iMan = CInstanceManager::GetInstancePointer();
+    m_iMan->AddInstance(CLASS_INTERFACE, this);
+    m_event = static_cast<CEventQueue *>( m_iMan->SearchInstance(CLASS_EVENT) );
+    m_engine = static_cast<Gfx::CEngine *>( m_iMan->SearchInstance(CLASS_ENGINE) );
+
+    for (int i = 0; i < MAXCONTROL; i++ )
     {
-        m_table[i] = 0;
+        m_table[i] = nullptr;
     }
 }
 
@@ -74,6 +41,7 @@ CInterface::CInterface(CInstanceManager* iMan)
 CInterface::~CInterface()
 {
     Flush();
+    m_iMan->DeleteInstance(CLASS_INTERFACE, this);
 }
 
 
@@ -81,424 +49,210 @@ CInterface::~CInterface()
 
 void CInterface::Flush()
 {
-    int     i;
-
-    for ( i=0 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] != 0 )
-        {
+    for (int i = 0; i < MAXCONTROL; i++ ) {
+        if ( m_table[i] != nullptr ) {
             delete m_table[i];
-            m_table[i] = 0;
+            m_table[i] = nullptr;
         }
     }
 }
 
 
-// Creates a new button.
-
-CWindow* CInterface::CreateWindows(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+int CInterface::GetNextFreeControl()
 {
-    CWindow*    pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    if ( eventMsg == EVENT_WINDOW0 )  {i=0; goto create;}
-    if ( eventMsg == EVENT_WINDOW1 )  {i=1; goto create;}
-    if ( eventMsg == EVENT_WINDOW2 )  {i=2; goto create;}
-    if ( eventMsg == EVENT_WINDOW3 )  {i=3; goto create;}
-    if ( eventMsg == EVENT_WINDOW4 )  {i=4; goto create;}
-    if ( eventMsg == EVENT_WINDOW5 )  {i=5; goto create;}
-    if ( eventMsg == EVENT_WINDOW6 )  {i=6; goto create;}
-    if ( eventMsg == EVENT_WINDOW7 )  {i=7; goto create;}
-    if ( eventMsg == EVENT_WINDOW8 )  {i=8; goto create;}
-    if ( eventMsg == EVENT_WINDOW9 )  {i=9; goto create;}
-
-    if ( eventMsg == EVENT_TOOLTIP )  {i=MAXCONTROL-1; goto create;}
-
-    for ( i=10 ; i<MAXCONTROL-1 ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            create:
-            m_table[i] = new CWindow(m_iMan);
-            pc = (CWindow*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
+    for (int i = 10; i < MAXCONTROL-1; i++) {
+        if (m_table[i] == nullptr)
+            return i;
     }
-    return 0;
+    return -1;
 }
 
-// Creates a new button.
 
-CButton* CInterface::CreateButton(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+template <typename T> inline T* CInterface::CreateControl(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CButton*    pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CButton(m_iMan);
-            pc = (CButton*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    T* pc;
+    int index;
+    if (eventMsg == EVENT_NULL)
+        eventMsg = GetUniqueEventType();
+
+    if ((index = GetNextFreeControl()) < 0)
+        return nullptr;
+
+    m_table[index] = new T();
+    pc = static_cast<T *>(m_table[index]);
+    pc->Create(pos, dim, icon, eventMsg);
+    return pc;
 }
 
+
 // Creates a new button.
 
-CColor* CInterface::CreateColor(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CWindow* CInterface::CreateWindows(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CColor*     pc;
-    int         i;
+    CWindow* pc;
+    int index;
+    if (eventMsg == EVENT_NULL)
+        eventMsg = GetUniqueEventType();
+
+    switch (eventMsg) {
+        case EVENT_WINDOW0: index = 0; break;
+        case EVENT_WINDOW1: index = 1; break;
+        case EVENT_WINDOW2: index = 2; break;
+        case EVENT_WINDOW3: index = 3; break;
+        case EVENT_WINDOW4: index = 4; break;
+        case EVENT_WINDOW5: index = 5; break;
+        case EVENT_WINDOW6: index = 6; break;
+        case EVENT_WINDOW7: index = 7; break;
+        case EVENT_WINDOW8: index = 8; break;
+        case EVENT_WINDOW9: index = 9; break;
+        case EVENT_TOOLTIP: index = MAXCONTROL-1; break;
+        default: index = GetNextFreeControl(); break;
+    }
 
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
+    if (index < 0)
+        return nullptr;
 
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CColor(m_iMan);
-            pc = (CColor*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    m_table[index] = new CWindow();
+    pc = static_cast<CWindow *>(m_table[index]);
+    pc->Create(pos, dim, icon, eventMsg);
+    return pc;
 }
 
 // Creates a new button.
 
-CCheck* CInterface::CreateCheck(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CButton* CInterface::CreateButton(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CCheck*     pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CCheck(m_iMan);
-            pc = (CCheck*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    return CreateControl<CButton>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new button.
 
-CKey* CInterface::CreateKey(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CColor* CInterface::CreateColor(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CKey*       pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CKey(m_iMan);
-            pc = (CKey*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    return CreateControl<CColor>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new button.
 
-CGroup* CInterface::CreateGroup(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CCheck* CInterface::CreateCheck(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CGroup*     pc;
-    int         i;
+    return CreateControl<CCheck>(pos, dim, icon, eventMsg);
+}
 
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
+// Creates a new button.
 
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CGroup(m_iMan);
-            pc = (CGroup*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+CKey* CInterface::CreateKey(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
+{
+    return CreateControl<CKey>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new button.
 
-CImage* CInterface::CreateImage(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CGroup* CInterface::CreateGroup(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CImage*     pc;
-    int         i;
+    return CreateControl<CGroup>(pos, dim, icon, eventMsg);
+}
 
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
+// Creates a new button.
 
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CImage(m_iMan);
-            pc = (CImage*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+CImage* CInterface::CreateImage(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
+{
+    return CreateControl<CImage>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new label.
 
-CLabel* CInterface::CreateLabel(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg,
-                             char *name)
+CLabel* CInterface::CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, const char *name)
 {
-    CLabel*     pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CLabel(m_iMan);
-            pc = (CLabel*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            pc->SetName(name);
-            return pc;
-        }
-    }
-    return 0;
+    CLabel* pc = CreateControl<CLabel>(pos, dim, icon, eventMsg);
+    if (pc != nullptr)
+        pc->SetName(name);
+    return pc;
 }
 
 // Creates a new pave editable.
 
-CEdit* CInterface::CreateEdit(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CEdit* CInterface::CreateEdit(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CEdit*      pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CEdit(m_iMan);
-            pc = (CEdit*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    return CreateControl<CEdit>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new pave editable.
 
-CEditValue* CInterface::CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CEditValue* CInterface::CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CEditValue* pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CEditValue(m_iMan);
-            pc = (CEditValue*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    return CreateControl<CEditValue>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new lift.
 
-CScroll* CInterface::CreateScroll(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CScroll* CInterface::CreateScroll(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CScroll*    pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CScroll(m_iMan);
-            pc = (CScroll*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    return CreateControl<CScroll>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new cursor.
 
-CSlider* CInterface::CreateSlider(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CSlider* CInterface::CreateSlider(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CSlider*    pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CSlider(m_iMan);
-            pc = (CSlider*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    return CreateControl<CSlider>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new list.
 
-CList* CInterface::CreateList(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg,
-                            float expand)
+CList* CInterface::CreateList(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, float expand)
 {
-    CList*      pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CList(m_iMan);
-            pc = (CList*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg, expand);
-            return pc;
-        }
-    }
-    return 0;
+    CList* pc;
+    int index;
+    if (eventMsg == EVENT_NULL)
+        eventMsg = GetUniqueEventType();
+
+    if ((index = GetNextFreeControl()) < 0)
+        return nullptr;
+
+    m_table[index] = new CList();
+    pc = static_cast<CList *>(m_table[index]);
+    pc->Create(pos, dim, icon, eventMsg, expand);
+    return pc;
 }
 
 // Creates a new shortcut.
 
-CShortcut* CInterface::CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CShortcut* CInterface::CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CShortcut*  ps;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CShortcut(m_iMan);
-            ps = (CShortcut*)m_table[i];
-            ps->Create(pos, dim, icon, eventMsg);
-            return ps;
-        }
-    }
-    return 0;
+    return CreateControl<CShortcut>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new compass.
 
-CCompass* CInterface::CreateCompass(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CCompass* CInterface::CreateCompass(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CCompass*   pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CCompass(m_iMan);
-            pc = (CCompass*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    return CreateControl<CCompass>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new target.
 
-CTarget* CInterface::CreateTarget(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CTarget* CInterface::CreateTarget(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CTarget*    pc;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CTarget(m_iMan);
-            pc = (CTarget*)m_table[i];
-            pc->Create(pos, dim, icon, eventMsg);
-            return pc;
-        }
-    }
-    return 0;
+    return CreateControl<CTarget>(pos, dim, icon, eventMsg);
 }
 
 // Creates a new map.
 
-CMap* CInterface::CreateMap(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+CMap* CInterface::CreateMap(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    CMap*       pm;
-    int         i;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
-
-    for ( i=10 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] == 0 )
-        {
-            m_table[i] = new CMap(m_iMan);
-            pm = (CMap*)m_table[i];
-            pm->Create(pos, dim, icon, eventMsg);
-            return pm;
-        }
-    }
-    return 0;
+    return CreateControl<CMap>(pos, dim, icon, eventMsg);
 }
 
 // Removes a control.
 
-bool CInterface::DeleteControl(EventMsg eventMsg)
+bool CInterface::DeleteControl(EventType eventMsg)
 {
-    int     i;
-
-    for ( i=0 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] != 0 )
-        {
-            if ( eventMsg == m_table[i]->RetEventMsg() )
-            {
+    for (int i = 0; i < MAXCONTROL; i++) {
+        if ( m_table[i] != nullptr ) {
+            if (eventMsg == m_table[i]->GetEventType()) {
                 delete m_table[i];
-                m_table[i] = 0;
+                m_table[i] = nullptr;
                 return true;
             }
         }
@@ -508,47 +262,32 @@ bool CInterface::DeleteControl(EventMsg eventMsg)
 
 // Gives a control.
 
-CControl* CInterface::SearchControl(EventMsg eventMsg)
+CControl* CInterface::SearchControl(EventType eventMsg)
 {
-    int     i;
-
-    for ( i=0 ; i<MAXCONTROL ; i++ )
-    {
-        if ( m_table[i] != 0 )
-        {
-            if ( eventMsg == m_table[i]->RetEventMsg() )
-            {
+    for (int i = 0; i < MAXCONTROL; i++) {
+        if (m_table[i] != nullptr) {
+            if (eventMsg == m_table[i]->GetEventType())
                 return m_table[i];
-            }
         }
     }
-    return 0;
+    return nullptr;
 }
 
 // Management of an event.
 
 bool CInterface::EventProcess(const Event &event)
 {
-    int     i;
-
-    if ( event.event == EVENT_MOUSEMOVE )
-    {
-        if ( m_camera == 0 )
-        {
-            m_camera = (CCamera*)m_iMan->SearchInstance(CLASS_CAMERA);
+    if (event.type == EVENT_MOUSE_MOVE) {
+        if (m_camera == nullptr) {
+            m_camera = static_cast<Gfx::CCamera *>(m_iMan->SearchInstance(CLASS_CAMERA));
         }
-        m_engine->SetMouseType(m_camera->RetMouseDef(event.pos));
+        m_engine->SetMouseType(m_camera->GetMouseDef(event.pos));
     }
 
-    for ( i=MAXCONTROL-1 ; i>=0 ; i-- )
-    {
-        if ( m_table[i] != 0 &&
-             m_table[i]->TestState(STATE_ENABLE) )
-        {
+    for (int i = MAXCONTROL-1; i >= 0; i--) {
+        if (m_table[i] != nullptr &&  m_table[i]->TestState(STATE_ENABLE)) {
             if ( !m_table[i]->EventProcess(event) )
-            {
                 return false;
-            }
         }
     }
 
@@ -558,18 +297,12 @@ bool CInterface::EventProcess(const Event &event)
 
 // Gives the tooltip binding to the window.
 
-bool CInterface::GetTooltip(Math::Point pos, char* name)
+bool CInterface::GetTooltip(Math::Point pos, const char* name)
 {
-    int     i;
-
-    for ( i=MAXCONTROL-1 ; i>=0 ; i-- )
-    {
-        if ( m_table[i] != 0 )
-        {
-            if ( m_table[i]->GetTooltip(pos, name) )
-            {
+    for (int i = MAXCONTROL-1; i >= 0; i--) {
+        if (m_table[i] != nullptr) {
+            if (m_table[i]->GetTooltip(pos, name))
                 return true;
-            }
         }
     }
     return false;
@@ -580,26 +313,19 @@ bool CInterface::GetTooltip(Math::Point pos, char* name)
 
 void CInterface::Draw()
 {
-    D3DMATERIAL7    material;
-    int             i;
-
-    ZeroMemory( &material, sizeof(D3DMATERIAL7) );
+    /*ZeroMemory( &material, sizeof(D3DMATERIAL7) );
     material.diffuse.r = 1.0f;
     material.diffuse.g = 1.0f;
     material.diffuse.b = 1.0f;
     material.ambient.r = 0.5f;
     material.ambient.g = 0.5f;
     material.ambient.b = 0.5f;
-    m_engine->SetMaterial(material);
+    m_engine->SetMaterial(material);*/
 
-    for ( i=0 ; i<MAXCONTROL ; i++ )
-//? for ( i=MAXCONTROL-1 ; i>=0 ; i-- )
-    {
-        if ( m_table[i] != 0 )
-        {
+    for (int i = 0; i < MAXCONTROL; i++) {
+        if ( m_table[i] != nullptr )
             m_table[i]->Draw();
-        }
     }
 }
 
-
+}
diff --git a/src/ui/interface.h b/src/ui/interface.h
index 8aa7f44..43f2698 100644
--- a/src/ui/interface.h
+++ b/src/ui/interface.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,77 +20,85 @@
 #pragma once
 
 
-#include "common/event.h"
-#include "math/point.h"
-
-
-class CInstanceManager;
-class CD3DEngine;
-class CControl;
-class CWindow;
-class CButton;
-class CColor;
-class CCheck;
-class CKey;
-class CGroup;
-class CImage;
-class CLabel;
-class CEdit;
-class CEditValue;
-class CScroll;
-class CSlider;
-class CList;
-class CShortcut;
-class CMap;
-class CGauge;
-class CCompass;
-class CTarget;
-class CCamera;
-
+#include <common/event.h>
+#include <common/struct.h>
+#include <common/misc.h>
+#include <common/iman.h>
+
+#include <math/point.h>
+
+#include <graphics/engine/camera.h>
+#include <graphics/engine/engine.h>
+
+#include <ui/control.h>
+#include <ui/button.h>
+#include <ui/color.h>
+#include <ui/check.h>
+#include <ui/key.h>
+#include <ui/group.h>
+#include <ui/image.h>
+#include <ui/label.h>
+#include <ui/edit.h>
+#include <ui/editvalue.h>
+#include <ui/scroll.h>
+#include <ui/slider.h>
+#include <ui/list.h>
+#include <ui/shortcut.h>
+#include <ui/compass.h>
+#include <ui/target.h>
+#include <ui/map.h>
+#include <ui/window.h>
+
+namespace Ui {
 
 const int MAXCONTROL = 100;
 
 
 class CInterface
 {
-public:
-    CInterface(CInstanceManager* iMan);
-    ~CInterface();
-
-    bool        EventProcess(const Event &event);
-    bool        GetTooltip(Math::Point pos, char* name);
-
-    void        Flush();
-    CWindow*    CreateWindows(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CButton*    CreateButton(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CColor*     CreateColor(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CCheck*     CreateCheck(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CKey*       CreateKey(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CGroup*     CreateGroup(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CImage*     CreateImage(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CLabel*     CreateLabel(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg, char *name);
-    CEdit*      CreateEdit(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CEditValue* CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CScroll*    CreateScroll(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CSlider*    CreateSlider(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CList*      CreateList(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg, float expand=1.2f);
-    CShortcut*  CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CCompass*   CreateCompass(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CTarget*    CreateTarget(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CMap*       CreateMap(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    bool        DeleteControl(EventMsg eventMsg);
-    CControl*   SearchControl(EventMsg eventMsg);
-
-    void        Draw();
-
-protected:
-
-protected:
-    CInstanceManager* m_iMan;
-    CD3DEngine*     m_engine;
-    CCamera*        m_camera;
-
-    CControl*       m_table[MAXCONTROL];
+    public:
+        CInterface();
+        ~CInterface();
+
+        bool        EventProcess(const Event &event);
+        bool        GetTooltip(Math::Point pos, const char* name);
+
+        void        Flush();
+        CButton*    CreateButton(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CColor*     CreateColor(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CCheck*     CreateCheck(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CKey*       CreateKey(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CGroup*     CreateGroup(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CImage*     CreateImage(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CEdit*      CreateEdit(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CEditValue* CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CScroll*    CreateScroll(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CSlider*    CreateSlider(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CShortcut*  CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CCompass*   CreateCompass(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CTarget*    CreateTarget(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CMap*       CreateMap(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+
+        CWindow*    CreateWindows(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        CList*      CreateList(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, float expand=1.2f);
+        CLabel*     CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, const char *name);
+
+        bool        DeleteControl(EventType eventMsg);
+        CControl*   SearchControl(EventType eventMsg);
+
+        void        Draw();
+
+    protected:
+        int GetNextFreeControl();
+        template <typename T> inline T* CreateControl(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+
+        CInstanceManager* m_iMan;
+        CEventQueue* m_event;
+        Gfx::CEngine* m_engine;
+        Gfx::CCamera* m_camera;
+
+        CControl* m_table[MAXCONTROL];
 };
 
 
+}
diff --git a/src/ui/key.cpp b/src/ui/key.cpp
index a1eebb3..0cf74bc 100644
--- a/src/ui/key.cpp
+++ b/src/ui/key.cpp
@@ -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
@@ -17,54 +18,33 @@
 // key.cpp
 
 
-#include <windows.h>
-#include <stdio.h>
-#include <d3d.h>
+#include <ui/key.h>
 
-#include "common/struct.h"
-#include "old/d3dengine.h"
-#include "old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "common/restext.h"
-#include "old/sound.h"
-#include "old/text.h"
-#include "ui/key.h"
-
-
-
-
-// Constructs the name of a button.
+namespace Ui {
 
 void GetKeyName(char *name, int key)
 {
-    if ( !GetResource(RES_KEY, key, name) )
-    {
-        if ( (key >= '0' && key <= '9') ||
-             (key >= 'A' && key <= 'Z') ||
-             (key >= 'a' && key <= 'z') )
-        {
+    if ( !GetResource(RES_KEY, key, name) ) {
+        if (isalnum(key)) {
             name[0] = key;
             name[1] = 0;
         }
-        else
-        {
+        else {
             sprintf(name, "Code %d", key);
         }
     }
 }
 
 
-
-
 // Object's constructor.
 
-CKey::CKey(CInstanceManager* iMan) : CControl(iMan)
+CKey::CKey() : CControl()
 {
     m_key[0] = 0;
     m_key[1] = 0;
     m_bCatch = false;
+
+    m_app = CApplication::GetInstancePointer();
 }
 
 // Object's destructor.
@@ -76,18 +56,14 @@ CKey::~CKey()
 
 // Creates a new button.
 
-bool CKey::Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+bool CKey::Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    char    name[100];
-    char*   p;
-
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
+    char name[100];
+    if (eventMsg == EVENT_NULL)
+        eventMsg = GetUniqueEventType();
 
     CControl::Create(pos, dim, icon, eventMsg);
-
     GetResource(RES_EVENT, eventMsg, name);
-    p = strchr(name, '\\');
-    if ( p != 0 )  *p = 0;
     SetName(name);
 
     return true;
@@ -98,47 +74,33 @@ bool CKey::Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
 
 bool CKey::EventProcess(const Event &event)
 {
-    if ( m_state & STATE_DEAD )  return true;
+    if (m_state & STATE_DEAD)
+        return true;
 
     CControl::EventProcess(event);
 
-    if ( event.event == EVENT_LBUTTONDOWN )
-    {
-        if ( Detect(event.pos) )
-        {
-            m_bCatch = true;
-        }
-        else
-        {
-            m_bCatch = false;
-        }
+    if (event.type == EVENT_MOUSE_BUTTON_DOWN) {
+        if (event.mouseButton.button == 1) // left
+            m_bCatch = Detect(event.pos);
     }
 
-    if ( event.event == EVENT_KEYDOWN && m_bCatch )
-    {
+    if (event.type == EVENT_MOUSE_BUTTON_DOWN && m_bCatch) {
         m_bCatch = false;
 
-        if ( TestKey(event.param) )  // impossible ?
-        {
+        if ( TestKey(event.param) ) { // impossible ?
             m_sound->Play(SOUND_TZOING);
-        }
-        else
-        {
-            if ( event.param == m_key[0] ||
-                 event.param == m_key[1] )
-            {
+        } else {
+            if ( event.param == m_key[0] || event.param == m_key[1] ) {
                 m_key[0] = event.param;
                 m_key[1] = 0;
-            }
-            else
-            {
+            } else {
                 m_key[1] = m_key[0];
                 m_key[0] = event.param;
             }
             m_sound->Play(SOUND_CLICK);
 
             Event newEvent = event;
-            newEvent.event = m_eventMsg;
+            newEvent.type = m_eventType;
             m_event->AddEvent(newEvent);
         }
         return false;
@@ -152,25 +114,17 @@ bool CKey::EventProcess(const Event &event)
 
 bool CKey::TestKey(int key)
 {
-    int     i, j;
-
-    if ( key == VK_PAUSE    ||
-         key == VK_SNAPSHOT )  return true;  // blocked key
-
-    for ( i=0 ; i<20 ; i++ )
-    {
-        for ( j=0 ; j<2 ; j++ )
-        {
-            if ( key == m_engine->RetKey(i, j) )  // key used?
-            {
-                m_engine->SetKey(i, j, 0);  // nothing!
-            }
+    if ( key == KEY(PAUSE) || key == KEY(PRINT) )  return true;  // blocked key
+
+    for (int i = 0; i < 20; i++) {
+        for (int j = 0; j < 2; j++) {
+            if (key == m_app->GetKey(i, j) )  // key used?
+                m_app->SetKey(i, j, 0);  // nothing!
         }
 
-        if ( m_engine->RetKey(i, 0) == 0 )  // first free option?
-        {
-            m_engine->SetKey(i, 0, m_engine->RetKey(i, 1));  // shift
-            m_engine->SetKey(i, 1, 0);
+        if ( m_app->GetKey(i, 0) == 0 ) { // first free option?
+            m_app->SetKey(i, 0, m_app->GetKey(i, 1));  // shift
+            m_app->SetKey(i, 1, 0);
         }
     }
 
@@ -182,107 +136,99 @@ bool CKey::TestKey(int key)
 
 void CKey::Draw()
 {
-    Math::Point     iDim, pos;
-    float       zoomExt, zoomInt, h;
-    int         icon;
-    char        text[100];
+    Math::Point iDim, pos;
+    float zoomExt, zoomInt, h;
+    int icon;
+    char text[100];
 
-    if ( (m_state & STATE_VISIBLE) == 0 )  return;
+    if ( (m_state & STATE_VISIBLE) == 0 )
+        return;
 
     iDim = m_dim;
     m_dim.x = 200.0f/640.0f;
 
     if ( m_state & STATE_SHADOW )
-    {
         DrawShadow(m_pos, m_dim);
-    }
+
 
     m_engine->SetTexture("button1.tga");
-    m_engine->SetState(D3DSTATENORMAL);
+    m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); // was D3DSTATENORMAL
 
     zoomExt = 1.00f;
     zoomInt = 0.95f;
 
     icon = 2;
-    if ( m_key[0] == 0 &&
-         m_key[1] == 0 )  // no shortcut?
-    {
+    if ( m_key[0] == 0 && m_key[1] == 0 )  // no shortcut?
         icon = 3;
-    }
-    if ( m_state & STATE_DEFAULT )
-    {
+
+    if ( m_state & STATE_DEFAULT ) {
         DrawPart(23, 1.3f, 0.0f);
 
         zoomExt *= 1.15f;
         zoomInt *= 1.15f;
     }
+
     if ( m_state & STATE_HILIGHT )
-    {
         icon = 1;
-    }
+
     if ( m_state & STATE_CHECK )
-    {
         icon = 0;
-    }
-    if ( m_state & STATE_PRESS )
-    {
+
+    if ( m_state & STATE_PRESS ) {
         icon = 3;
         zoomInt *= 0.9f;
     }
+
     if ( (m_state & STATE_ENABLE) == 0 )
-    {
         icon = 7;
-    }
+
     if ( m_state & STATE_DEAD )
-    {
         icon = 17;
-    }
+
     if ( m_bCatch )
-    {
         icon = 23;
-    }
-    DrawPart(icon, zoomExt, 8.0f/256.0f);  // draws the button
 
-    h = m_engine->RetText()->RetHeight(m_fontSize, m_fontType)/2.0f;
+    DrawPart(icon, zoomExt, 8.0f / 256.0f);  // draws the button
+
+    h = m_engine->GetText()->GetHeight(m_fontType, m_fontSize) / 2.0f;
 
     GetKeyName(text, m_key[0]);
-    if ( m_key[1] != 0 )
-    {
+    if ( m_key[1] != 0 ) {
         GetResource(RES_TEXT, RT_KEY_OR, text+strlen(text));
         GetKeyName(text+strlen(text), m_key[1]);
     }
 
-    pos.x = m_pos.x+m_dim.x*0.5f;
-    pos.y = m_pos.y+m_dim.y*0.5f;
+    pos.x = m_pos.x + m_dim.x * 0.5f;
+    pos.y = m_pos.y + m_dim.y * 0.5f;
     pos.y -= h;
-    m_engine->RetText()->DrawText(text, pos, m_dim.x, 0, m_fontSize, m_fontStretch, m_fontType, 0);
+    m_engine->GetText()->DrawText(std::string(text), m_fontType, m_fontSize, pos, m_dim.x, Gfx::TEXT_ALIGN_CENTER, 0);
 
     m_dim = iDim;
 
-    if ( m_state & STATE_DEAD )  return;
+    if ( m_state & STATE_DEAD )
+        return;
 
     // Draws the name.
-    pos.x = m_pos.x+(214.0f/640.0f);
-    pos.y = m_pos.y+m_dim.y*0.5f;
+    pos.x = m_pos.x + (214.0f / 640.0f);
+    pos.y = m_pos.y + m_dim.y * 0.5f;
     pos.y -= h;
-    m_engine->RetText()->DrawText(m_name, pos, m_dim.x, 1, m_fontSize, m_fontStretch, m_fontType, 0);
+    m_engine->GetText()->DrawText(std::string(m_name), m_fontType, m_fontSize, pos, m_dim.x, Gfx::TEXT_ALIGN_RIGHT, 0);
 }
 
 
 
 void CKey::SetKey(int option, int key)
 {
-    if ( option < 0 ||
-         option > 1 )  return;
+    if ( option < 0 || option > 1 )  return;
 
     m_key[option] = key;
 }
 
-int CKey::RetKey(int option)
+int CKey::GetKey(int option)
 {
-    if ( option < 0 ||
-         option > 1 )  return 0;
+    if ( option < 0 || option > 1 )  return 0;
 
     return m_key[option];
 }
 
+}
diff --git a/src/ui/key.h b/src/ui/key.h
index 314f39b..5ca71b0 100644
--- a/src/ui/key.h
+++ b/src/ui/key.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,35 +19,43 @@
 
 #pragma once
 
+#include <cctype>
+#include <string>
 
-#include "ui/control.h"
+#include <ui/control.h>
 
+#include <common/iman.h>
+#include <common/event.h>
+#include <common/restext.h>
+#include <common/key.h>
 
-class CD3DEngine;
-
+#include <app/app.h>
 
+namespace Ui {
 
 class CKey : public CControl
 {
-public:
-    CKey(CInstanceManager* iMan);
-    virtual ~CKey();
+    public:
+        CKey();
+        virtual ~CKey();
 
-    bool    Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
+        bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        bool    EventProcess(const Event &event);
 
-    bool    EventProcess(const Event &event);
+        void    Draw();
 
-    void    Draw();
+        void    SetKey(int option, int key);
+        int     GetKey(int option);
 
-    void    SetKey(int option, int key);
-    int     RetKey(int option);
+    protected:
+        bool    TestKey(int key);
 
-protected:
-    bool    TestKey(int key);
+        int     m_key[2];
+        bool    m_bCatch;
 
-protected:
-    int     m_key[2];
-    bool    m_bCatch;
+        CApplication *m_app;
 };
 
 
+}
+
diff --git a/src/ui/label.cpp b/src/ui/label.cpp
index cd96493..c5da211 100644
--- a/src/ui/label.cpp
+++ b/src/ui/label.cpp
@@ -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
@@ -17,25 +18,14 @@
 // label.cpp
 
 
-#include <windows.h>
-#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "old/d3dengine.h"
-#include "old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "old/text.h"
-#include "ui/label.h"
-
+#include <ui/label.h>
 
+namespace Ui {
 
 
 // Object's constructor.
 
-CLabel::CLabel(CInstanceManager* iMan) : CControl(iMan)
+CLabel::CLabel() : CControl()
 {
 }
 
@@ -48,9 +38,10 @@ CLabel::~CLabel()
 
 // Creates a new button.
 
-bool CLabel::Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
+bool CLabel::Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg)
 {
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
+    if (eventMsg == EVENT_NULL)
+        eventMsg = GetUniqueEventType();
 
     CControl::Create(pos, dim, icon, eventMsg);
     return true;
@@ -72,22 +63,18 @@ void CLabel::Draw()
 {
     Math::Point pos;
 
-    if ( (m_state & STATE_VISIBLE) == 0 )  return;
+    if ( (m_state & STATE_VISIBLE) == 0 )
+        return;
 
-    pos.y = m_pos.y+m_dim.y/2.0f;
+    pos.y = m_pos.y + m_dim.y / 2.0f;
 
-    if ( m_justif > 0 )
-    {
-        pos.x = m_pos.x;
-    }
-    if ( m_justif == 0 )
-    {
-        pos.x = m_pos.x+m_dim.x/2.0f;
+    switch (m_textAlign) {
+        case Gfx::TEXT_ALIGN_RIGHT: pos.x = m_pos.x; break;
+        case Gfx::TEXT_ALIGN_CENTER: pos.x = m_pos.x + m_dim.x / 2.0f; break;
+        case Gfx::TEXT_ALIGN_LEFT: pos.x = m_pos.x + m_dim.x; break;
     }
-    if ( m_justif < 0 )
-    {
-        pos.x = m_pos.x+m_dim.x;
-    }
-    m_engine->RetText()->DrawText(m_name, pos, m_dim.x, m_justif, m_fontSize, m_fontStretch, m_fontType, 0);
+
+    m_engine->GetText()->DrawText(std::string(m_name), m_fontType, m_fontSize, pos, m_dim.x, m_textAlign, 0);
 }
 
+}
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();
 };
 
 
+}
diff --git a/src/ui/list.cpp b/src/ui/list.cpp
index 9fbc5d9..73a48e3 100644
--- a/src/ui/list.cpp
+++ b/src/ui/list.cpp
@@ -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
@@ -17,50 +18,31 @@
 // list.cpp
 
 
-#include <windows.h>
-#include <stdio.h>
-#include <d3d.h>
-
-#include "common/struct.h"
-#include "old/d3dengine.h"
-#include "old/math3d.h"
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/iman.h"
-#include "ui/button.h"
-#include "ui/scroll.h"
-#include "old/text.h"
-#include "ui/list.h"
+#include <ui/list.h>
 
 
+namespace Ui {
 
 const float MARGING = 4.0f;
 
 
-
 // Object's constructor.
 
-CList::CList(CInstanceManager* iMan) : CControl(iMan)
+CList::CList() : CControl()
 {
-    int     i;
-
-    for ( i=0 ; i<LISTMAXDISPLAY ; i++ )
-    {
-        m_button[i] = 0;
-    }
-    m_scroll = 0;
+    for (int i = 0; i < LISTMAXDISPLAY; i++)
+        m_button[i] = nullptr;
 
-    for ( i=0 ; i<LISTMAXTOTAL ; i++ )
-    {
+    m_scroll = nullptr;
+    for (int i = 0; i < LISTMAXTOTAL; i++) {
         m_text[i][0] = 0;
         m_check[i] = false;
         m_enable[i] = true;
     }
 
-    for ( i=0 ; i<10 ; i++ )
-    {
+    for (int i = 0; i < 10; i++) {
         m_tabs[i] = 0.0f;
-        m_justifs[i] = 1;
+        m_justifs[i] = Gfx::TEXT_ALIGN_RIGHT;
     }
 
     m_totalLine = 0;
@@ -76,29 +58,30 @@ CList::CList(CInstanceManager* iMan) : CControl(iMan)
 
 CList::~CList()
 {
-    int     i;
-
-    for ( i=0 ; i<LISTMAXDISPLAY ; i++ )
-    {
-        delete m_button[i];
+    for (int i = 0; i < LISTMAXDISPLAY; i++) {
+        if (m_button[i] != nullptr)
+            delete m_button[i];
     }
-    delete m_scroll;
+
+    if (m_scroll != nullptr)
+        delete m_scroll;
 }
 
 
 // Creates a new list.
 
-bool CList::Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg,
-                   float expand)
+bool CList::Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, float expand)
 {
     m_expand = expand;
 
-    if ( eventMsg == EVENT_NULL )  eventMsg = GetUniqueEventMsg();
+    if (eventMsg == EVENT_NULL)
+        eventMsg = GetUniqueEventType();
+
     CControl::Create(pos, dim, icon, eventMsg);
 
-    m_scroll = new CScroll(m_iMan);
+    m_scroll = new CScroll();
     m_scroll->Create(pos, dim, 0, EVENT_NULL);
-    m_eventScroll = m_scroll->RetEventMsg();
+    m_eventScroll = m_scroll->GetEventType();
 
     return MoveAdjust();
 }
@@ -107,52 +90,54 @@ bool CList::Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg
 
 bool CList::MoveAdjust()
 {
-    Math::Point     ipos, idim, ppos, ddim;
-    float       marging, h;
-    int         i;
+    Math::Point ipos, idim, ppos, ddim;
+    float marging, h;
 
-    for ( i=0 ; i<LISTMAXDISPLAY ; i++ )
-    {
-        delete m_button[i];
-        m_button[i] = 0;
+    for (int i = 0; i < LISTMAXDISPLAY; i++) {
+        if (m_button[i] != nullptr) {
+            delete m_button[i];
+            m_button[i] = nullptr;
+        }
     }
 
-    if ( m_icon == 0 )  marging = MARGING;
-    else                marging = 0.0f;
+    if (m_icon == 0)
+        marging = MARGING;
+    else
+        marging = 0.0f;
 
-    ipos.x = m_pos.x+marging/640.f;
-    ipos.y = m_pos.y+marging/480.f;
-    idim.x = m_dim.x-marging*2.0f/640.f;
-    idim.y = m_dim.y-marging*2.0f/480.f;
+    ipos.x = m_pos.x + marging / 640.f;
+    ipos.y = m_pos.y + marging / 480.f;
+    idim.x = m_dim.x - marging * 2.0f / 640.f;
+    idim.y = m_dim.y - marging * 2.0f / 480.f;
 
-    h = m_engine->RetText()->RetHeight(m_fontSize, m_fontType)*m_expand;
+    h = m_engine->GetText()->GetHeight(m_fontType, m_fontSize) * m_expand;
 
-    m_displayLine = (int)(idim.y/h);
-    if ( m_displayLine == 0 )  return false;
-    if ( m_displayLine > LISTMAXDISPLAY )  m_displayLine = LISTMAXDISPLAY;
-    idim.y = h*m_displayLine;
-    m_dim.y = idim.y+marging*2.0f/480.f;
+    m_displayLine = static_cast<int>(idim.y / h);
+    if (m_displayLine == 0)
+        return false;
+    if (m_displayLine > LISTMAXDISPLAY)
+        m_displayLine = LISTMAXDISPLAY;
+    idim.y = h * m_displayLine;
+    m_dim.y = idim.y + marging * 2.0f / 480.f;
 
     ppos.x = ipos.x;
-    ppos.y = ipos.y+idim.y-h;
-    ddim.x = idim.x-SCROLL_WIDTH;
+    ppos.y = ipos.y + idim.y - h;
+    ddim.x = idim.x - SCROLL_WIDTH;
     ddim.y = h;
-    for ( i=0 ; i<m_displayLine ; i++ )
-    {
-        m_button[i] = new CButton(m_iMan);
+    for (int i = 0; i < m_displayLine; i++) {
+        m_button[i] = new CButton();
         m_button[i]->Create(ppos, ddim, -1, EVENT_NULL);
-        m_button[i]->SetJustif(1);
+        m_button[i]->SetTextAlign(Gfx::TEXT_ALIGN_RIGHT);
         m_button[i]->SetState(STATE_SIMPLY);
         m_button[i]->SetFontType(m_fontType);
         m_button[i]->SetFontSize(m_fontSize);
         ppos.y -= h;
 
-        m_eventButton[i] = m_button[i]->RetEventMsg();
+        m_eventButton[i] = m_button[i]->GetEventType();
     }
 
-    if ( m_scroll != 0 )
-    {
-        ppos.x = ipos.x+idim.x-SCROLL_WIDTH;
+    if ( m_scroll != nullptr ) {
+        ppos.x = ipos.x + idim.x - SCROLL_WIDTH;
         ppos.y = ipos.y;
         ddim.x = SCROLL_WIDTH;
         ddim.y = idim.y;
@@ -168,19 +153,22 @@ bool CList::MoveAdjust()
 
 // Returns the message of a button.
 
-EventMsg CList::RetEventMsgButton(int i)
+EventType CList::GetEventMsgButton(int i)
 {
-    if ( i < 0 || i >= m_displayLine )  return EVENT_NULL;
-    if ( m_button[i] == 0 )  return EVENT_NULL;
-    return m_button[i]->RetEventMsg();
+    if (i < 0 || i >= m_displayLine)
+        return EVENT_NULL;
+    if (m_button[i] == nullptr)
+        return EVENT_NULL;
+    return m_button[i]->GetEventType();
 }
 
 // Returns the message from the elevator.
 
-EventMsg CList::RetEventMsgScroll()
+EventType CList::GetEventMsgScroll()
 {
-    if ( m_scroll == 0 )  return EVENT_NULL;
-    return m_scroll->RetEventMsg();
+    if (m_scroll == nullptr)
+        return EVENT_NULL;
+    return m_scroll->GetEventType();
 }
 
 
@@ -189,6 +177,7 @@ void CList::SetPos(Math::Point pos)
     CControl::SetPos(pos);
 }
 
+
 void CList::SetDim(Math::Point dim)
 {
     m_dim = dim;
@@ -199,47 +188,43 @@ void CList::SetDim(Math::Point dim)
 
 bool CList::SetState(int state, bool bState)
 {
-    int     i;
-
-    if ( state & STATE_ENABLE )
-    {
-        for ( i=0 ; i<m_displayLine ; i++ )
-        {
-            if ( m_button[i] != 0 )  m_button[i]->SetState(state, bState);
+    if (state & STATE_ENABLE) {
+        for (int i = 0; i < m_displayLine; i++) {
+            if (m_button[i] != nullptr)
+                m_button[i]->SetState(state, bState);
         }
-        if ( m_scroll != 0 )  m_scroll->SetState(state, bState);
+        if (m_scroll != nullptr)
+            m_scroll->SetState(state, bState);
     }
 
     return CControl::SetState(state, bState);
 }
 
+
 bool CList::SetState(int state)
 {
-    int     i;
-
-    if ( state & STATE_ENABLE )
-    {
-        for ( i=0 ; i<m_displayLine ; i++ )
-        {
-            if ( m_button[i] != 0 )  m_button[i]->SetState(state);
+    if (state & STATE_ENABLE) {
+        for (int i = 0; i < m_displayLine; i++) {
+            if (m_button[i] != nullptr)
+                m_button[i]->SetState(state);
         }
-        if ( m_scroll != 0 )  m_scroll->SetState(state);
+        if (m_scroll != nullptr)
+            m_scroll->SetState(state);
     }
 
     return CControl::SetState(state);
 }
 
+
 bool CList::ClearState(int state)
 {
-    int     i;
-
-    if ( state & STATE_ENABLE )
-    {
-        for ( i=0 ; i<m_displayLine ; i++ )
-        {
-            if ( m_button[i] != 0 )  m_button[i]->ClearState(state);
+    if (state & STATE_ENABLE) {
+        for (int i = 0; i < m_displayLine; i++) {
+            if (m_button[i] != nullptr)
+                m_button[i]->ClearState(state);
         }
-        if ( m_scroll != 0 )  m_scroll->ClearState(state);
+        if (m_scroll != nullptr)
+            m_scroll->ClearState(state);
     }
 
     return CControl::ClearState(state);
@@ -250,47 +235,38 @@ bool CList::ClearState(int state)
 
 bool CList::EventProcess(const Event &event)
 {
-    int     i;
-
-    if ( m_bBlink                   &&  // blinks?
-         event.event == EVENT_FRAME )
-    {
+    int i;
+    if (m_bBlink && event.type == EVENT_FRAME) {
         i = m_selectLine-m_firstLine;
 
-        if ( i >= 0 && i < 4  &&
-             m_button[i] != 0 )
-        {
+        if (i >= 0 && i < 4  && m_button[i] != nullptr) {
             m_blinkTime += event.rTime;
-            if ( Math::Mod(m_blinkTime, 0.7f) < 0.3f )
-            {
+            if (Math::Mod(m_blinkTime, 0.7f) < 0.3f) {
                 m_button[i]->ClearState(STATE_ENABLE);
                 m_button[i]->ClearState(STATE_CHECK);
-            }
-            else
-            {
+            } else {
                 m_button[i]->SetState(STATE_ENABLE);
                 m_button[i]->SetState(STATE_CHECK);
             }
         }
     }
 
-    if ( (m_state & STATE_VISIBLE) == 0 )  return true;
-    if ( (m_state & STATE_ENABLE) == 0 )  return true;
+    if ((m_state & STATE_VISIBLE) == 0)
+        return true;
+    if ((m_state & STATE_ENABLE) == 0)
+        return true;
 
-    if ( event.event == EVENT_KEYDOWN &&
-         event.param == VK_WHEELUP    &&
-         Detect(event.pos)            )
-    {
-        if ( m_firstLine > 0 )  m_firstLine --;
+    if (event.type == EVENT_KEY_DOWN && event.mouseButton.button == 5 && Detect(event.pos)) {
+        if (m_firstLine > 0)
+            m_firstLine--;
         UpdateScroll();
         UpdateButton();
         return true;
     }
-    if ( event.event == EVENT_KEYDOWN &&
-         event.param == VK_WHEELDOWN  &&
-         Detect(event.pos)            )
-    {
-        if ( m_firstLine < m_totalLine-m_displayLine )  m_firstLine ++;
+
+    if (event.type == EVENT_KEY_DOWN && event.mouseButton.button == 4 && Detect(event.pos)) {
+        if (m_firstLine < m_totalLine - m_displayLine)
+            m_firstLine++;
         UpdateScroll();
         UpdateButton();
         return true;
@@ -298,46 +274,41 @@ bool CList::EventProcess(const Event &event)
 
     CControl::EventProcess(event);
 
-    if ( event.event == EVENT_MOUSEMOVE && Detect(event.pos) )
-    {
-        m_engine->SetMouseType(D3DMOUSENORM);
-        for ( i=0 ; i<m_displayLine ; i++ )
-        {
-            if ( i+m_firstLine >= m_totalLine )  break;
-            if ( m_button[i] != 0 )
-            {
+    if (event.type == EVENT_MOUSE_MOVE && Detect(event.pos)) {
+        m_engine->SetMouseType(Gfx::ENG_MOUSE_NORM);
+        for (i = 0; i < m_displayLine; i++) {
+            if (i + m_firstLine >= m_totalLine)
+                break;
+            if (m_button[i] != nullptr)
                 m_button[i]->EventProcess(event);
-            }
         }
     }
 
-    if ( m_bSelectCap )
-    {
-        for ( i=0 ; i<m_displayLine ; i++ )
-        {
-            if ( i+m_firstLine >= m_totalLine )  break;
-            if ( m_button[i] != 0 )
-            {
-                if ( !m_button[i]->EventProcess(event) )  return false;
-
-                if ( event.event == m_eventButton[i] )
-                {
-                    SetSelect(m_firstLine+i);
+    if (m_bSelectCap) {
+        for (i = 0; i < m_displayLine; i++) {
+            if (i + m_firstLine >= m_totalLine)
+                break;
+
+            if (m_button[i] != nullptr) {
+                if (!m_button[i]->EventProcess(event))
+                    return false;
+
+                if (event.type == m_eventButton[i]) {
+                    SetSelect(m_firstLine + i);
 
                     Event newEvent = event;
-                    newEvent.event = m_eventMsg;
+                    newEvent.type = m_eventType;
                     m_event->AddEvent(newEvent);  // selected line changes
                 }
             }
         }
     }
 
-    if ( m_scroll != 0 )
-    {
-        if ( !m_scroll->EventProcess(event) )  return false;
+    if (m_scroll != nullptr) {
+        if (!m_scroll->EventProcess(event))
+            return false;
 
-        if ( event.event == m_eventScroll )
-        {
+        if (event.type == m_eventScroll) {
             MoveScroll();
             UpdateButton();
         }
@@ -353,46 +324,40 @@ void CList::Draw()
 {
     Math::Point uv1, uv2, corner, pos, dim, ppos, ddim;
     float   dp;
-    int     i, j;
+    int     i;
     char    text[100];
     char    *pb, *pe;
 
-    if ( (m_state & STATE_VISIBLE) == 0 )  return;
+    if ((m_state & STATE_VISIBLE) == 0)
+        return;
 
-    if ( m_state & STATE_SHADOW )
-    {
+    if (m_state & STATE_SHADOW)
         DrawShadow(m_pos, m_dim);
-    }
 
-    dp = 0.5f/256.0f;
+    dp = 0.5f / 256.0f;
 
-    if ( m_icon != -1 )
-    {
+    if (m_icon != -1) {
         dim = m_dim;
 
-        if ( m_icon == 0 )
-        {
+        if (m_icon == 0) {
             m_engine->SetTexture("button2.tga");
-            m_engine->SetState(D3DSTATENORMAL);
+            m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
 
-            uv1.x = 128.0f/256.0f;
-            uv1.y =  64.0f/256.0f;  // u-v texture
-            uv2.x = 160.0f/256.0f;
-            uv2.y =  96.0f/256.0f;
-        }
-        else
-        {
+            uv1.x = 128.0f / 256.0f;
+            uv1.y =  64.0f / 256.0f;  // u-v texture
+            uv2.x = 160.0f / 256.0f;
+            uv2.y =  96.0f / 256.0f;
+        } else {
             m_engine->SetTexture("button2.tga");
-            m_engine->SetState(D3DSTATENORMAL);
+            m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
 
-            uv1.x = 132.0f/256.0f;
-            uv1.y =  68.0f/256.0f;  // u-v texture
-            uv2.x = 156.0f/256.0f;
-            uv2.y =  92.0f/256.0f;
+            uv1.x = 132.0f / 256.0f;
+            uv1.y =  68.0f / 256.0f;  // u-v texture
+            uv2.x = 156.0f / 256.0f;
+            uv2.y =  92.0f / 256.0f;
 
-            if ( m_button[0] != 0 )
-            {
-                dim = m_button[0]->RetDim();
+            if (m_button[0] != nullptr) {
+                dim = m_button[0]->GetDim();
                 dim.y *= m_displayLine;  // background sounds spot behind
             }
         }
@@ -402,28 +367,26 @@ void CList::Draw()
         uv2.x -= dp;
         uv2.y -= dp;
 
-        corner.x = 10.0f/640.0f;
-        corner.y = 10.0f/480.0f;
-        DrawIcon(m_pos, dim, uv1, uv2, corner, 8.0f/256.0f);
+        corner.x = 10.0f / 640.0f;
+        corner.y = 10.0f / 480.0f;
+        DrawIcon(m_pos, dim, uv1, uv2, corner, 8.0f / 256.0f);
     }
 
-    if ( m_totalLine < m_displayLine )  // no buttons to the bottom?
-    {
+    if ( m_totalLine < m_displayLine ) { // no buttons to the bottom?
         i = m_totalLine;
-        if ( m_button[i] != 0 )
-        {
-            pos = m_button[i]->RetPos();
-            dim = m_button[i]->RetDim();
-            pos.y += dim.y*1.1f;
+        if ( m_button[i] != 0 ) {
+            pos = m_button[i]->GetPos();
+            dim = m_button[i]->GetDim();
+            pos.y += dim.y * 1.1f;
             dim.y *= 0.4f;
             pos.y -= dim.y;
 
             m_engine->SetTexture("button2.tga");
-            m_engine->SetState(D3DSTATETTw);
-            uv1.x = 120.0f/256.0f;
-            uv1.y =  64.0f/256.0f;
-            uv2.x = 128.0f/256.0f;
-            uv2.y =  48.0f/256.0f;
+            m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); // was D3DSTATETTw
+            uv1.x = 120.0f / 256.0f;
+            uv1.y =  64.0f / 256.0f;
+            uv2.x = 128.0f / 256.0f;
+            uv2.y =  48.0f / 256.0f;
             uv1.x += dp;
             uv1.y -= dp;
             uv2.x -= dp;
@@ -432,108 +395,93 @@ void CList::Draw()
         }
     }
 
-    for ( i=0 ; i<m_displayLine ; i++ )
-    {
-        if ( i+m_firstLine >= m_totalLine )  break;
+    for (i = 0; i < m_displayLine; i++) {
+        if ( i + m_firstLine >= m_totalLine )
+            break;
 
-        if ( m_button[i] != 0 )
-        {
-            if ( !m_bBlink && i+m_firstLine < m_totalLine )
-            {
+        if ( m_button[i] != nullptr ) {
+            if ( !m_bBlink && i + m_firstLine < m_totalLine )
                 m_button[i]->SetState(STATE_ENABLE, m_enable[i+m_firstLine] && (m_state & STATE_ENABLE) );
-            }
+
             m_button[i]->Draw();  // draws a box without text
 
             // draws text in the box
-            pos = m_button[i]->RetPos();
-            dim = m_button[i]->RetDim();
-            if ( m_tabs[0] == 0.0f )
-            {
-                ppos.x = pos.x+dim.y*0.5f;
-                ppos.y = pos.y+dim.y*0.5f;
-                ppos.y -= m_engine->RetText()->RetHeight(m_fontSize, m_fontType)/2.0f;
+            pos = m_button[i]->GetPos();
+            dim = m_button[i]->GetDim();
+            if ( m_tabs[0] == 0.0f ) {
+                ppos.x = pos.x + dim.y * 0.5f;
+                ppos.y = pos.y + dim.y * 0.5f;
+                ppos.y -= m_engine->GetText()->GetHeight(m_fontType, m_fontSize) / 2.0f;
                 ddim.x = dim.x-dim.y;
-                DrawCase(m_text[i+m_firstLine], ppos, ddim.x, 1);
-            }
-            else
-            {
-                ppos.x = pos.x+dim.y*0.5f;
-                ppos.y = pos.y+dim.y*0.5f;
-                ppos.y -= m_engine->RetText()->RetHeight(m_fontSize, m_fontType)/2.0f;
-                pb = m_text[i+m_firstLine];
-                for ( j=0 ; j<10 ; j++ )
-                {
+                DrawCase(m_text[i + m_firstLine], ppos, ddim.x, Gfx::TEXT_ALIGN_RIGHT);
+            }  else {
+                ppos.x = pos.x + dim.y * 0.5f;
+                ppos.y = pos.y + dim.y * 0.5f;
+                ppos.y -= m_engine->GetText()->GetHeight(m_fontType, m_fontSize) / 2.0f;
+                pb = m_text[i + m_firstLine];
+                for (int j = 0; j < 10; j++) {
                     pe = strchr(pb, '\t');
                     if ( pe == 0 )
-                    {
                         strcpy(text, pb);
-                    }
-                    else
-                    {
-                        strncpy(text, pb, pe-pb);
-                        text[pe-pb] = 0;
+                    else {
+                        strncpy(text, pb, pe - pb);
+                        text[pe - pb] = 0;
                     }
                     DrawCase(text, ppos, m_tabs[j], m_justifs[j]);
 
-                    if ( pe == 0 )  break;
+                    if ( pe == 0 )
+                        break;
                     ppos.x += m_tabs[j];
-                    pb = pe+1;
+                    pb = pe + 1;
                 }
             }
 
-            if ( (m_state & STATE_EXTEND) && i < m_totalLine )
-            {
-                pos = m_button[i]->RetPos();
-                dim = m_button[i]->RetDim();
-                pos.x += dim.x-dim.y*0.75f;
-                dim.x = dim.y*0.75f;
-                pos.x += 2.0f/640.0f;
-                pos.y += 2.0f/480.0f;
-                dim.x -= 4.0f/640.0f;
-                dim.y -= 4.0f/480.0f;
-
-                if ( m_check[i+m_firstLine] )
-                {
+            if ( (m_state & STATE_EXTEND) && i < m_totalLine) {
+                pos = m_button[i]->GetPos();
+                dim = m_button[i]->GetDim();
+                pos.x += dim.x - dim.y * 0.75f;
+                dim.x = dim.y * 0.75f;
+                pos.x += 2.0f / 640.0f;
+                pos.y += 2.0f / 480.0f;
+                dim.x -= 4.0f / 640.0f;
+                dim.y -= 4.0f / 480.0f;
+
+                if ( m_check[i + m_firstLine] ) {
                     m_engine->SetTexture("button1.tga");
-                    m_engine->SetState(D3DSTATENORMAL);
-                    uv1.x = 64.0f/256.0f;
-                    uv1.y =  0.0f/256.0f;
-                    uv2.x = 96.0f/256.0f;
-                    uv2.y = 32.0f/256.0f;
+                    m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
+                    uv1.x = 64.0f / 256.0f;
+                    uv1.y =  0.0f / 256.0f;
+                    uv2.x = 96.0f / 256.0f;
+                    uv2.y = 32.0f / 256.0f;
                     uv1.x += dp;
                     uv1.y += dp;
                     uv2.x -= dp;
                     uv2.y -= dp;
                     DrawIcon(pos, dim, uv1, uv2);  // square shape
 
-                    m_engine->SetState(D3DSTATETTw);
-                    uv1.x =  0.0f/256.0f;  // v
-                    uv1.y = 64.0f/256.0f;
-                    uv2.x = 32.0f/256.0f;
-                    uv2.y = 96.0f/256.0f;
+                    m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); // was D3DSTATETTw
+                    uv1.x =  0.0f / 256.0f;  // v
+                    uv1.y = 64.0f / 256.0f;
+                    uv2.x = 32.0f / 256.0f;
+                    uv2.y = 96.0f / 256.0f;
                     uv1.x += dp;
                     uv1.y += dp;
                     uv2.x -= dp;
                     uv2.y -= dp;
                     DrawIcon(pos, dim, uv1, uv2);  // draws v
-                }
-                else
-                {
+                } else {
                     m_engine->SetTexture("button1.tga");
-                    m_engine->SetState(D3DSTATETTw);
-                    if ( i+m_firstLine == m_selectLine )
-                    {
-                        uv1.x =224.0f/256.0f;  // <
-                        uv1.y =192.0f/256.0f;
-                        uv2.x =256.0f/256.0f;
-                        uv2.y =224.0f/256.0f;
-                    }
-                    else
-                    {
-                        uv1.x = 96.0f/256.0f;  // x
-                        uv1.y = 32.0f/256.0f;
-                        uv2.x =128.0f/256.0f;
-                        uv2.y = 64.0f/256.0f;
+                    m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); // was D3DSTATETTw
+                    if ( i + m_firstLine == m_selectLine ) {
+                        uv1.x =224.0f / 256.0f;  // <
+                        uv1.y =192.0f / 256.0f;
+                        uv2.x =256.0f / 256.0f;
+                        uv2.y =224.0f / 256.0f;
+                    } else {
+                        uv1.x = 96.0f / 256.0f;  // x
+                        uv1.y = 32.0f / 256.0f;
+                        uv2.x =128.0f / 256.0f;
+                        uv2.y = 64.0f / 256.0f;
                     }
                     uv1.x += dp;
                     uv1.y += dp;
@@ -546,29 +494,18 @@ void CList::Draw()
     }
 
     if ( m_scroll != 0 )
-    {
         m_scroll->Draw();  // draws the lift
-    }
 }
 
 // Displays text in a box.
 
-void CList::DrawCase(char *text, Math::Point pos, float width, int justif)
+void CList::DrawCase(char *text, Math::Point pos, float width, Gfx::TextAlign justif)
 {
-    if ( justif == 1 )
-    {
-        m_engine->RetText()->DrawText(text, pos, width, 1, m_fontSize, m_fontStretch, m_fontType, 0);
-    }
-    else if ( justif == 0 )
-    {
-        pos.x += width/2.0f;
-        m_engine->RetText()->DrawText(text, pos, width, 0, m_fontSize, m_fontStretch, m_fontType, 0);
-    }
-    else
-    {
+    if (justif == Gfx::TEXT_ALIGN_CENTER)
+        pos.x += width / 2.0f;
+    else if (justif == Gfx::TEXT_ALIGN_LEFT)
         pos.x += width;
-        m_engine->RetText()->DrawText(text, pos, width, -1, m_fontSize, m_fontStretch, m_fontType, 0);
-    }
+    m_engine->GetText()->DrawText(std::string(text), m_fontType, m_fontSize, pos, width, justif, 0);
 }
 
 
@@ -593,7 +530,7 @@ void CList::SetTotal(int i)
 
 // Returns the total number of lines.
 
-int CList::RetTotal()
+int CList::GetTotal()
 {
     return m_totalLine;
 }
@@ -604,11 +541,8 @@ int CList::RetTotal()
 void CList::SetSelect(int i)
 {
     if ( m_bSelectCap )
-    {
         m_selectLine = i;
-    }
-    else
-    {
+    else {
         m_firstLine = i;
         UpdateScroll();
     }
@@ -618,16 +552,12 @@ void CList::SetSelect(int i)
 
 // Returns the selected line.
 
-int CList::RetSelect()
+int CList::GetSelect()
 {
     if ( m_bSelectCap )
-    {
         return m_selectLine;
-    }
     else
-    {
         return m_firstLine;
-    }
 }
 
 
@@ -638,7 +568,7 @@ void CList::SetSelectCap(bool bEnable)
     m_bSelectCap = bEnable;
 }
 
-bool CList::RetSelectCap()
+bool CList::GetSelectCap()
 {
     return m_bSelectCap;
 }
@@ -648,25 +578,22 @@ bool CList::RetSelectCap()
 
 void CList::SetBlink(bool bEnable)
 {
-    int     i;
+    int i;
 
     m_bBlink = bEnable;
     m_blinkTime = 0.0f;
 
     i = m_selectLine-m_firstLine;
 
-    if ( i >= 0 && i < 4  &&
-         m_button[i] != 0 )
-    {
-        if ( !bEnable )
-        {
+    if (i >= 0 && i < 4  &&  m_button[i] != nullptr) {
+        if ( !bEnable ) {
             m_button[i]->SetState(STATE_CHECK);
             m_button[i]->ClearState(STATE_ENABLE);
         }
     }
 }
 
-bool CList::RetBlink()
+bool CList::GetBlink()
 {
     return m_bBlink;
 }
@@ -676,30 +603,27 @@ bool CList::RetBlink()
 
 void CList::SetName(int i, char* name)
 {
-    if ( i < 0 || i >= LISTMAXTOTAL )  return;
+    if ( i < 0 || i >= LISTMAXTOTAL )
+        return;
 
     if ( i >= m_totalLine )
-    {
         m_totalLine = i+1;  // expands the list
-    }
 
     if ( name[0] == 0 )
-    {
         strcpy(m_text[i], " ");
-    }
     else
-    {
         strcpy(m_text[i], name);
-    }
+
     UpdateButton();
     UpdateScroll();
 }
 
 // Returns the text of a line.
 
-char* CList::RetName(int i)
+char* CList::GetName(int i)
 {
-    if ( i < 0 || i >= m_totalLine )  return 0;
+    if ( i < 0 || i >= m_totalLine )
+        return 0;
 
     return m_text[i];
 }
@@ -709,16 +633,18 @@ char* CList::RetName(int i)
 
 void CList::SetCheck(int i, bool bMode)
 {
-    if ( i < 0 || i >= m_totalLine )  return;
+    if ( i < 0 || i >= m_totalLine )
+        return;
 
     m_check[i] = bMode;
 }
 
 // Returns the bit "check" for a box.
 
-bool CList::RetCheck(int i)
+bool CList::GetCheck(int i)
 {
-    if ( i < 0 || i >= m_totalLine )  return false;
+    if ( i < 0 || i >= m_totalLine )
+        return false;
 
     return m_check[i];
 }
@@ -728,16 +654,18 @@ bool CList::RetCheck(int i)
 
 void CList::SetEnable(int i, bool bMode)
 {
-    if ( i < 0 || i >= m_totalLine )  return;
+    if ( i < 0 || i >= m_totalLine )
+        return;
 
     m_enable[i] = bMode;
 }
 
 // Returns the bit "enable" for a box.
 
-bool CList::RetEnable(int i)
+bool CList::GetEnable(int i)
 {
-    if ( i < 0 || i >= m_totalLine )  return false;
+    if ( i < 0 || i >= m_totalLine )
+        return false;
 
     return m_enable[i];
 }
@@ -745,16 +673,18 @@ bool CList::RetEnable(int i)
 
 // Management of the position of the tabs.
 
-void CList::SetTabs(int i, float pos, int justif)
+void CList::SetTabs(int i, float pos, Gfx::TextAlign justif)
 {
-    if ( i < 0 || i >= 10 )  return;
+    if ( i < 0 || i >= 10 )
+        return;
     m_tabs[i] = pos;
     m_justifs[i] = justif;
 }
 
-float  CList::RetTabs(int i)
+float  CList::GetTabs(int i)
 {
-    if ( i < 0 || i >= 10 )  return 0.0f;
+    if ( i < 0 || i >= 10 )
+        return 0.0f;
     return m_tabs[i];
 }
 
@@ -765,19 +695,20 @@ void CList::ShowSelect(bool bFixed)
 {
     int     sel;
 
-    if ( bFixed &&
-         m_selectLine >= m_firstLine &&
-         m_selectLine <  m_firstLine+m_displayLine )  return;  // all good
+    if ( bFixed && m_selectLine >= m_firstLine && m_selectLine <  m_firstLine+m_displayLine )
+        return;  // all good
 
     sel = m_selectLine;
 
     // Down from 1/2 * h.
-    sel += m_displayLine/2;
-    if ( sel > m_totalLine-1 )  sel = m_totalLine-1;
+    sel += m_displayLine / 2;
+    if ( sel > m_totalLine - 1 )
+        sel = m_totalLine - 1;
 
     // Back to h-1.
-    sel -= m_displayLine-1;
-    if ( sel < 0 )  sel = 0;
+    sel -= m_displayLine - 1;
+    if ( sel < 0 )
+        sel = 0;
 
     m_firstLine = sel;
 
@@ -790,25 +721,22 @@ void CList::ShowSelect(bool bFixed)
 
 void CList::UpdateButton()
 {
-    int     state, i, j;
+    int state, i, j;
 
-    state = CControl::RetState();
+    state = CControl::GetState();
 
     j = m_firstLine;
-    for ( i=0 ; i<m_displayLine ; i++ )
-    {
-        if ( m_button[i] == 0 )  continue;
+    for (i = 0; i < m_displayLine; i++) {
+        if (m_button[i] == nullptr)
+            continue;
 
         m_button[i]->SetState(STATE_CHECK, (j == m_selectLine));
 
-        if ( j < m_totalLine )
-        {
+        if ( j < m_totalLine ) {
 //?         m_button[i]->SetName(m_text[j]);
             m_button[i]->SetName(" ");  // blank button
             m_button[i]->SetState(STATE_ENABLE, (state & STATE_ENABLE));
-        }
-        else
-        {
+        } else {
             m_button[i]->SetName(" ");  // blank button
             m_button[i]->ClearState(STATE_ENABLE);
         }
@@ -820,27 +748,28 @@ void CList::UpdateButton()
 
 void CList::UpdateScroll()
 {
-    float   ratio, value, step;
+    float ratio, value, step;
 
-    if ( m_scroll == 0 )  return;
+    if (m_scroll == nullptr)
+        return;
 
-    if ( m_totalLine <= m_displayLine )
-    {
+    if (m_totalLine <= m_displayLine) {
         ratio = 1.0f;
         value = 0.0f;
         step = 0.0f;
-    }
-    else
-    {
-        ratio = (float)m_displayLine/m_totalLine;
+    } else {
+        ratio = (float)m_displayLine / m_totalLine;
         if ( ratio > 1.0f )  ratio = 1.0f;
 
-        value = (float)m_firstLine/(m_totalLine-m_displayLine);
-        if ( value < 0.0f )  value = 0.0f;
-        if ( value > 1.0f )  value = 1.0f;
+        value = (float)m_firstLine / (m_totalLine - m_displayLine);
+        if ( value < 0.0f )
+            value = 0.0f;
+        if ( value > 1.0f )
+            value = 1.0f;
 
-        step = (float)1.0f/(m_totalLine-m_displayLine);
-        if ( step < 0.0f )  step = 0.0f;
+        step = (float)1.0f/ (m_totalLine - m_displayLine);
+        if ( step < 0.0f )
+            step = 0.0f;
     }
 
     m_scroll->SetVisibleRatio(ratio);
@@ -852,17 +781,21 @@ void CList::UpdateScroll()
 
 void CList::MoveScroll()
 {
-    float   pos;
-    int     n;
+    float pos;
+    int n;
 
-    if ( m_scroll == 0 )  return;
+    if ( m_scroll == 0 )
+        return;
 
-    n = m_totalLine-m_displayLine;
-    pos = m_scroll->RetVisibleValue();
-    pos += m_scroll->RetArrowStep()/2.0f;  // it's magic!
-    m_firstLine = (int)(pos*n);
-    if ( m_firstLine < 0 )  m_firstLine = 0;
-    if ( m_firstLine > n )  m_firstLine = n;
+    n = m_totalLine - m_displayLine;
+    pos = m_scroll->GetVisibleValue();
+    pos += m_scroll->GetArrowStep() / 2.0f;  // it's magic!
+    m_firstLine = (int)(pos * n);
+    if ( m_firstLine < 0 )
+        m_firstLine = 0;
+    if ( m_firstLine > n )
+        m_firstLine = n;
 }
 
 
+}
diff --git a/src/ui/list.h b/src/ui/list.h
index cc9e646..2fc5e4d 100644
--- a/src/ui/list.h
+++ b/src/ui/list.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,15 +20,18 @@
 #pragma once
 
 
-#include "ui/control.h"
-#include "common/event.h"
+#include <ui/control.h>
+#include <ui/button.h>
+#include <ui/scroll.h>
 
+#include <common/event.h>
+#include <common/misc.h>
 
-class CD3DEngine;
-class CButton;
-class CScroll;
+#include <graphics/engine/text.h>
 
 
+namespace Ui {
+
 const int LISTMAXDISPLAY = 20;  // maximum number of visible lines
 const int LISTMAXTOTAL   = 100; // maximum total number of lines
 
@@ -35,81 +39,83 @@ const int LISTMAXTOTAL   = 100; // maximum total number of lines
 
 class CList : public CControl
 {
-public:
-    CList(CInstanceManager* iMan);
-    ~CList();
+    public:
+        CList();
+        ~CList();
 
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg, float expand);
+        bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, float expand);
 
-    void        SetPos(Math::Point pos);
-    void        SetDim(Math::Point dim);
+        void        SetPos(Math::Point pos);
+        void        SetDim(Math::Point dim);
 
-    bool        SetState(int state, bool bState);
-    bool        SetState(int state);
-    bool        ClearState(int state);
+        bool        SetState(int state, bool bState);
+        bool        SetState(int state);
+        bool        ClearState(int state);
 
-    bool        EventProcess(const Event &event);
-    void        Draw();
+        bool        EventProcess(const Event &event);
+        void        Draw();
 
-    void        Flush();
+        void        Flush();
 
-    void        SetTotal(int i);
-    int         RetTotal();
+        void        SetTotal(int i);
+        int         GetTotal();
 
-    void        SetSelect(int i);
-    int         RetSelect();
+        void        SetSelect(int i);
+        int         GetSelect();
 
-    void        SetSelectCap(bool bEnable);
-    bool        RetSelectCap();
+        void        SetSelectCap(bool bEnable);
+        bool        GetSelectCap();
 
-    void        SetBlink(bool bEnable);
-    bool        RetBlink();
+        void        SetBlink(bool bEnable);
+        bool        GetBlink();
 
-    void        SetName(int i, char* name);
-    char*       RetName(int i);
+        void        SetName(int i, char* name);
+        char*       GetName(int i);
 
-    void        SetCheck(int i, bool bMode);
-    bool        RetCheck(int i);
+        void        SetCheck(int i, bool bMode);
+        bool        GetCheck(int i);
 
-    void        SetEnable(int i, bool bEnable);
-    bool        RetEnable(int i);
+        void        SetEnable(int i, bool bEnable);
+        bool        GetEnable(int i);
 
-    void        SetTabs(int i, float pos, int justif=1);
-    float       RetTabs(int i);
+        void        SetTabs(int i, float pos, Gfx::TextAlign justif=Gfx::TEXT_ALIGN_CENTER);
+        float       GetTabs(int i);
 
-    void        ShowSelect(bool bFixed);
+        void        ShowSelect(bool bFixed);
 
-    EventMsg    RetEventMsgButton(int i);
-    EventMsg    RetEventMsgScroll();
+        EventType    GetEventMsgButton(int i);
+        EventType    GetEventMsgScroll();
 
-protected:
-    bool        MoveAdjust();
-    void        UpdateButton();
-    void        UpdateScroll();
-    void        MoveScroll();
-    void        DrawCase(char *text, Math::Point pos, float width, int justif);
+    protected:
+        bool        MoveAdjust();
+        void        UpdateButton();
+        void        UpdateScroll();
+        void        MoveScroll();
+        void        DrawCase(char *text, Math::Point pos, float width, Gfx::TextAlign justif);
 
-protected:
-    CButton*    m_button[LISTMAXDISPLAY];
-    CScroll*    m_scroll;
+    protected:
+        CButton*    m_button[LISTMAXDISPLAY];
+        CScroll*    m_scroll;
 
-    EventMsg    m_eventButton[LISTMAXDISPLAY];
-    EventMsg    m_eventScroll;
+        EventType    m_eventButton[LISTMAXDISPLAY];
+        EventType    m_eventScroll;
 
-    float       m_expand;
-    int         m_totalLine;    // total number of lines
-    int         m_displayLine;  // number of visible lines
-    int         m_selectLine;   // selected line
-    int         m_firstLine;    // first visible line
-    bool        m_bBlink;
-    bool        m_bSelectCap;
-    float       m_blinkTime;
-    float       m_tabs[10];
-    int         m_justifs[10];
+        float       m_expand;
+        int         m_totalLine;    // total number of lines
+        int         m_displayLine;  // number of visible lines
+        int         m_selectLine;   // selected line
+        int         m_firstLine;    // first visible line
+        bool        m_bBlink;
+        bool        m_bSelectCap;
+        float       m_blinkTime;
+        float       m_tabs[10];
+        Gfx::TextAlign m_justifs[10];
 
-    char        m_text[LISTMAXTOTAL][100];
-    char        m_check[LISTMAXTOTAL];
-    char        m_enable[LISTMAXTOTAL];
+        char        m_text[LISTMAXTOTAL][100];
+        char        m_check[LISTMAXTOTAL];
+        char        m_enable[LISTMAXTOTAL];
 };
 
 
+}
+
diff --git a/src/ui/map.h b/src/ui/map.h
index efdf54b..693398c 100644
--- a/src/ui/map.h
+++ b/src/ui/map.h
@@ -19,16 +19,14 @@
 #pragma once
 
 
-#include "ui/control.h"
-#include "object/object.h"
+#include <ui/control.h>
 
+#include <object/object.h>
+
+#include <common/event.h>
 
-class CD3DEngine;
 class CTerrain;
 class CWater;
-class CRobotMain;
-
-
 
 const int MAPMAXOBJECT = 100;
 
@@ -62,10 +60,10 @@ struct MapObject
 class CMap : public CControl
 {
 public:
-    CMap(CInstanceManager* iMan);
+    CMap();
     ~CMap();
 
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
+    bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
     bool        EventProcess(const Event &event);
     void        Draw();
 
diff --git a/src/ui/scroll.cpp b/src/ui/scroll.cpp
index 051de8d..5526c80 100644
--- a/src/ui/scroll.cpp
+++ b/src/ui/scroll.cpp
@@ -35,7 +35,7 @@
 
 // Object's constructor.
 
-CScroll::CScroll(CInstanceManager* iMan) : CControl(iMan)
+CScroll::CScroll() : CControl()
 {
     m_buttonUp   = 0;
     m_buttonDown = 0;
@@ -106,7 +106,7 @@ void CScroll::MoveAdjust()
             pc = (CButton*)m_buttonUp;
             pc->Create(Math::Point(0.0f, 0.0f), Math::Point(0.0f, 0.0f), 49, EVENT_NULL);
             pc->SetRepeat(true);
-            m_eventUp = pc->RetEventMsg();
+            m_eventUp = pc->GetEventMsg();
         }
 
         if ( m_buttonDown == 0 )
@@ -115,7 +115,7 @@ void CScroll::MoveAdjust()
             pc = (CButton*)m_buttonDown;
             pc->Create(Math::Point(0.0f, 0.0f), Math::Point(0.0f, 0.0f), 50, EVENT_NULL);
             pc->SetRepeat(true);
-            m_eventDown = pc->RetEventMsg();
+            m_eventDown = pc->GetEventMsg();
         }
     }
 
@@ -299,7 +299,7 @@ bool CScroll::EventProcess(const Event &event)
          m_buttonUp != 0              )
     {
         Event newEvent = event;
-        newEvent.event = m_buttonUp->RetEventMsg();
+        newEvent.event = m_buttonUp->GetEventMsg();
         m_event->AddEvent(newEvent);
     }
     if ( event.event == EVENT_KEYDOWN &&
@@ -308,7 +308,7 @@ bool CScroll::EventProcess(const Event &event)
          m_buttonDown != 0            )
     {
         Event newEvent = event;
-        newEvent.event = m_buttonDown->RetEventMsg();
+        newEvent.event = m_buttonDown->GetEventMsg();
         m_event->AddEvent(newEvent);
     }
 
@@ -437,7 +437,7 @@ void CScroll::SetVisibleValue(float value)
     AdjustGlint();
 }
 
-float CScroll::RetVisibleValue()
+float CScroll::GetVisibleValue()
 {
     return m_visibleValue;
 }
@@ -451,7 +451,7 @@ void CScroll::SetVisibleRatio(float value)
     AdjustGlint();
 }
 
-float CScroll::RetVisibleRatio()
+float CScroll::GetVisibleRatio()
 {
     return m_visibleRatio;
 }
@@ -462,7 +462,7 @@ void CScroll::SetArrowStep(float step)
     m_step = step;
 }
 
-float CScroll::RetArrowStep()
+float CScroll::GetArrowStep()
 {
     return m_step;
 }
diff --git a/src/ui/scroll.h b/src/ui/scroll.h
index 6854e61..289d309 100644
--- a/src/ui/scroll.h
+++ b/src/ui/scroll.h
@@ -19,12 +19,9 @@
 #pragma once
 
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
-class CButton;
+#include <ui/control.h>
 
+#include <common/event.h>
 
 const float SCROLL_WIDTH = (15.0f/640.0f);
 
@@ -32,50 +29,50 @@ const float SCROLL_WIDTH = (15.0f/640.0f);
 
 class CScroll : public CControl
 {
-public:
-    CScroll(CInstanceManager* iMan);
-    ~CScroll();
+    public:
+        CScroll();
+        ~CScroll();
 
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
+        bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
 
-    void        SetPos(Math::Point pos);
-    void        SetDim(Math::Point dim);
+        void        SetPos(Math::Point pos);
+        void        SetDim(Math::Point dim);
 
-    bool        SetState(int state, bool bState);
-    bool        SetState(int state);
-    bool        ClearState(int state);
+        bool        SetState(int state, bool bState);
+        bool        SetState(int state);
+        bool        ClearState(int state);
 
-    bool        EventProcess(const Event &event);
-    void        Draw();
+        bool        EventProcess(const Event &event);
+        void        Draw();
 
-    void        SetVisibleValue(float value);
-    float       RetVisibleValue();
+        void        SetVisibleValue(float value);
+        float       GetVisibleValue();
 
-    void        SetVisibleRatio(float value);
-    float       RetVisibleRatio();
+        void        SetVisibleRatio(float value);
+        float       GetVisibleRatio();
 
-    void        SetArrowStep(float step);
-    float       RetArrowStep();
+        void        SetArrowStep(float step);
+        float       GetArrowStep();
 
-protected:
-    void        MoveAdjust();
-    void        AdjustGlint();
-    void        DrawVertex(Math::Point pos, Math::Point dim, int icon);
+    protected:
+        void        MoveAdjust();
+        void        AdjustGlint();
+        void        DrawVertex(Math::Point pos, Math::Point dim, int icon);
 
-protected:
-    CButton*    m_buttonUp;
-    CButton*    m_buttonDown;
+    protected:
+        CButton*    m_buttonUp;
+        CButton*    m_buttonDown;
 
-    float       m_visibleValue;
-    float       m_visibleRatio;
-    float       m_step;
+        float       m_visibleValue;
+        float       m_visibleRatio;
+        float       m_step;
 
-    bool        m_bCapture;
-    Math::Point     m_pressPos;
-    float       m_pressValue;
+        bool        m_bCapture;
+        Math::Point     m_pressPos;
+        float       m_pressValue;
 
-    EventMsg    m_eventUp;
-    EventMsg    m_eventDown;
+        EventType    m_eventUp;
+        EventType    m_eventDown;
 };
 
 
diff --git a/src/ui/shortcut.h b/src/ui/shortcut.h
index b918ccc..d819bf2 100644
--- a/src/ui/shortcut.h
+++ b/src/ui/shortcut.h
@@ -18,31 +18,28 @@
 
 #pragma once
 
+#include <ui/control.h>
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
-
+#include <common/event.h>
 
 
 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 eventMsg);
 
-    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;
 };
 
 
diff --git a/src/ui/slider.h b/src/ui/slider.h
index b8f22d4..e79b348 100644
--- a/src/ui/slider.h
+++ b/src/ui/slider.h
@@ -1,6 +1,5 @@
 // * 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
@@ -20,64 +19,60 @@
 #pragma once
 
 
-#include "ui/control.h"
-
-namespace Gfx{
-class CEngine;
-};
-class CButton;
+#include <ui/control.h>
 
+#include <common/event.h>
 
 
 class CSlider : public CControl
 {
-public:
-    CSlider(CInstanceManager* iMan);
-    ~CSlider();
+    public:
+        CSlider();
+        ~CSlider();
 
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
+        bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
 
-    void        SetPos(Math::Point pos);
-    void        SetDim(Math::Point dim);
+        void        SetPos(Math::Point pos);
+        void        SetDim(Math::Point dim);
 
-    bool        SetState(int state, bool bState);
-    bool        SetState(int state);
-    bool        ClearState(int state);
+        bool        SetState(int state, bool bState);
+        bool        SetState(int state);
+        bool        ClearState(int state);
 
-    bool        EventProcess(const Event &event);
-    void        Draw();
+        bool        EventProcess(const Event &event);
+        void        Draw();
 
-    void        SetLimit(float min, float max);
+        void        SetLimit(float min, float max);
 
-    void        SetVisibleValue(float value);
-    float       GetVisibleValue();
+        void        SetVisibleValue(float value);
+        float       RetVisibleValue();
 
-    void        SetArrowStep(float step);
-    float       GetArrowStep();
+        void        SetArrowStep(float step);
+        float       RetArrowStep();
 
-protected:
-    void        MoveAdjust();
-    void        AdjustGlint();
-    void        DrawVertex(Math::Point pos, Math::Point dim, int icon);
+    protected:
+        void        MoveAdjust();
+        void        AdjustGlint();
+        void        DrawVertex(Math::Point pos, Math::Point dim, int icon);
 
-protected:
-    CButton*    m_buttonLeft;
-    CButton*    m_buttonRight;
+    protected:
+        CButton*    m_buttonLeft;
+        CButton*    m_buttonRight;
 
-    float       m_min;
-    float       m_max;
-    float       m_visibleValue;
-    float       m_step;
+        float       m_min;
+        float       m_max;
+        float       m_visibleValue;
+        float       m_step;
 
-    bool        m_bHoriz;
-    float       m_marginButton;
+        bool        m_bHoriz;
+        float       m_marginButton;
 
-    bool        m_bCapture;
-    Math::Point     m_pressPos;
-    float       m_pressValue;
+        bool        m_bCapture;
+        Math::Point     m_pressPos;
+        float       m_pressValue;
 
-    EventType    m_eventUp;
-    EventType    m_eventDown;
+        EventType    m_eventUp;
+        EventType    m_eventDown;
 };
 
 
diff --git a/src/ui/target.h b/src/ui/target.h
index ae0c7af..a2615b4 100644
--- a/src/ui/target.h
+++ b/src/ui/target.h
@@ -19,30 +19,25 @@
 #pragma once
 
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
-class CObject;
+#include <ui/control.h>
 
+#include <common/event.h>
 
 
 class CTarget : public CControl
 {
-public:
-    CTarget(CInstanceManager* iMan);
-    ~CTarget();
-
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
+    public:
+        CTarget();
+        ~CTarget();
 
-    bool        EventProcess(const Event &event);
-    void        Draw();
-    bool        GetTooltip(Math::Point pos, char* name);
+        bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
 
-protected:
-    CObject*    DetectFriendObject(Math::Point pos);
+        bool        EventProcess(const Event &event);
+        void        Draw();
+        bool        GetTooltip(Math::Point pos, char* name);
 
-protected:
+    protected:
+        CObject*    DetectFriendObject(Math::Point pos);
 };
 
 
diff --git a/src/ui/window.h b/src/ui/window.h
index 3acf3b4..8884c6f 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -19,27 +19,8 @@
 #pragma once
 
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
-class CButton;
-class CColor;
-class CCheck;
-class CKey;
-class CGroup;
-class CImage;
-class CLabel;
-class CEdit;
-class CEditValue;
-class CScroll;
-class CSlider;
-class CList;
-class CShortcut;
-class CMap;
-class CGauge;
-class CCompass;
-class CTarget;
+#include <ui/control.h>
+#include <common/event.h>
 
 
 const int MAXWINDOW = 100;
@@ -48,34 +29,34 @@ const int MAXWINDOW = 100;
 class CWindow : public CControl
 {
 public:
-    CWindow(CInstanceManager* iMan);
+    CWindow();
     ~CWindow();
 
     void        Flush();
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CButton*    CreateButton(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CColor*     CreateColor(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CCheck*     CreateCheck(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CKey*       CreateKey(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CGroup*     CreateGroup(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CImage*     CreateImage(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CLabel*     CreateLabel(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg, char *name);
-    CEdit*      CreateEdit(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CEditValue* CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CScroll*    CreateScroll(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CSlider*    CreateSlider(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CList*      CreateList(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg, float expand=1.2f);
-    CShortcut*  CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CMap*       CreateMap(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CGauge*     CreateGauge(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CCompass*   CreateCompass(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CTarget*    CreateTarget(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    bool        DeleteControl(EventMsg eventMsg);
-    CControl*   SearchControl(EventMsg eventMsg);
-
-    EventMsg    RetEventMsgReduce();
-    EventMsg    RetEventMsgFull();
-    EventMsg    RetEventMsgClose();
+    bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CButton*    CreateButton(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CColor*     CreateColor(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CCheck*     CreateCheck(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CKey*       CreateKey(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CGroup*     CreateGroup(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CImage*     CreateImage(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CLabel*     CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, char *name);
+    CEdit*      CreateEdit(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CEditValue* CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CScroll*    CreateScroll(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CSlider*    CreateSlider(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CList*      CreateList(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, float expand=1.2f);
+    CShortcut*  CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CMap*       CreateMap(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CGauge*     CreateGauge(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CCompass*   CreateCompass(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CTarget*    CreateTarget(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    bool        DeleteControl(EventType eventMsg);
+    CControl*   SearchControl(EventType eventMsg);
+
+    EventType    RetEventTypeReduce();
+    EventType    RetEventTypeFull();
+    EventType    RetEventTypeClose();
 
     void        SetName(char* name);