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, 11 insertions, 16 deletions

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