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

1 files changed, 12 insertions, 15 deletions

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;
 };