Merge branch 'dev-ui' into dev

Conflicts:
	src/CMakeLists.txt
	src/common/misc.cpp
	src/common/misc.h
	src/object/robotmain.cpp
	src/object/robotmain.h
	src/script/cbottoken.cpp
	src/script/cbottoken.h
	src/ui/button.cpp
	src/ui/button.h
	src/ui/check.cpp
	src/ui/check.h
	src/ui/color.cpp
	src/ui/color.h
	src/ui/compass.cpp
	src/ui/compass.h
	src/ui/control.cpp
	src/ui/control.h
	src/ui/displayinfo.cpp
	src/ui/displayinfo.h
	src/ui/displaytext.cpp
	src/ui/displaytext.h
	src/ui/edit.cpp
	src/ui/edit.h
	src/ui/gauge.cpp
	src/ui/gauge.h
	src/ui/interface.cpp
	src/ui/interface.h
	src/ui/key.cpp
	src/ui/map.h
	src/ui/shortcut.h
	src/ui/slider.h
	src/ui/target.cpp
	src/ui/target.h
	src/ui/window.cpp
	src/ui/window.h

1 files changed, 33 insertions, 32 deletions

diff --git a/src/ui/mainshort.h b/src/ui/mainshort.h
index f260f0e..d570484 100644
--- a/src/ui/mainshort.h
+++ b/src/ui/mainshort.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,45 +19,45 @@
 
 #pragma once
 
+#include <ui/interface.h>
 
-#include "common/event.h"
-#include "math/point.h"
+#include <common/event.h>
 
+#include <math/point.h>
 
-class CInstanceManager;
-class CD3DEngine;
-class CInterface;
-class CRobotMain;
-class CObject;
+#include <object/object.h>
 
+#include <graphics/engine/engine.h>
+
+namespace Ui {
 
 
 class CMainShort
 {
-public:
-    CMainShort(CInstanceManager* iMan);
-    ~CMainShort();
-
-    void        SetMode(bool bBuilding);
-    void        FlushShortcuts();
-    bool        CreateShortcuts();
-    bool        UpdateShortcuts();
-    void        SelectShortcut(EventMsg event);
-    void        SelectNext();
-    CObject*    DetectShort(Math::Point pos);
-    void        SetHilite(CObject* pObj);
-
-protected:
-
-protected:
-    CInstanceManager* m_iMan;
-    CEvent*         m_event;
-    CD3DEngine*     m_engine;
-    CInterface*     m_interface;
-    CRobotMain*     m_main;
-
-    CObject*        m_shortcuts[20];
-    bool            m_bBuilding;
+    public:
+        CMainShort();
+        ~CMainShort();
+
+        void        SetMode(bool bBuilding);
+        void        FlushShortcuts();
+        bool        CreateShortcuts();
+        bool        UpdateShortcuts();
+        void        SelectShortcut(EventType event);
+        void        SelectNext();
+        CObject*    DetectShort(Math::Point pos);
+        void        SetHighlight(CObject* pObj);
+
+    protected:
+
+    protected:
+        CInstanceManager* m_iMan;
+        CEvent*         m_event;
+        Gfx::CEngine*     m_engine;
+        CInterface*     m_interface;
+        CRobotMain*     m_main;
+
+        CObject*        m_shortcuts[20];
+        bool            m_bBuilding;
 };
 
-
+}