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, 18 insertions, 17 deletions

diff --git a/src/ui/compass.h b/src/ui/compass.h
index 1d48907..e8ccc17 100644
--- a/src/ui/compass.h
+++ b/src/ui/compass.h
@@ -20,34 +20,35 @@
 #pragma once
 
 
-#include "ui/control.h"
+#include "control.h"
 
 namespace Gfx {
-class CEngine;
+    class CEngine;
 }
 
 namespace Ui {
-class CCompass : public CControl
-{
-public:
-//    CCompass(CInstanceManager* iMan);
-    CCompass();
-    virtual ~CCompass();
 
-    bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
+    class CCompass : public CControl
+    {
+    public:
+    //    CCompass(CInstanceManager* iMan);
+        CCompass();
+        virtual ~CCompass();
 
-    bool    EventProcess(const Event &event);
+        bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
 
-    void    Draw();
+        bool    EventProcess(const Event &event);
 
-    void    SetDirection(float dir);
-    float   GetDirection();
+        void    Draw();
 
-protected:
+        void    SetDirection(float dir);
+        float   GetDirection();
 
-protected:
-    float   m_dir;
-};
+    protected:
+
+    protected:
+        float   m_dir;
+    };
 
 
 }