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, 21 insertions, 24 deletions

diff --git a/src/ui/button.h b/src/ui/button.h
index 924a4d8..ffaf220 100644
--- a/src/ui/button.h
+++ b/src/ui/button.h
@@ -19,39 +19,36 @@
 
 #pragma once
 
+#include "control.h"
 
-#include "ui/control.h"
+namespace Ui {
 
-namespace Gfx{
-class CEngine;
-}
 
-namespace Ui {
-class CButton : public CControl
-{
-public:
-    CButton();
-    virtual ~CButton();
+    class CButton : public CControl
+    {
+    public:
+        CButton();
+        virtual ~CButton();
 
-    bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
+        bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
 
-    bool    EventProcess(const Event &event);
+        bool    EventProcess(const Event &event);
 
-    void    Draw();
+        void    Draw();
 
-    void    SetImmediat(bool bRepeat);
-    bool    GetImmediat();
+        void    SetImmediat(bool bRepeat);
+        bool    GetImmediat();
 
-    void    SetRepeat(bool bRepeat);
-    bool    GetRepeat();
+        void    SetRepeat(bool bRepeat);
+        bool    GetRepeat();
 
-protected:
+    protected:
 
-protected:
-    bool    m_bCapture;
-    bool    m_bImmediat;
-    bool    m_bRepeat;
-    float   m_repeat;
-};
+    protected:
+        bool    m_bCapture;
+        bool    m_bImmediat;
+        bool    m_bRepeat;
+        float   m_repeat;
+    };
 
 }