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, 27 insertions, 46 deletions

diff --git a/src/ui/window.h b/src/ui/window.h
index 3acf3b4..8884c6f 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -19,27 +19,8 @@
 #pragma once
 
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
-class CButton;
-class CColor;
-class CCheck;
-class CKey;
-class CGroup;
-class CImage;
-class CLabel;
-class CEdit;
-class CEditValue;
-class CScroll;
-class CSlider;
-class CList;
-class CShortcut;
-class CMap;
-class CGauge;
-class CCompass;
-class CTarget;
+#include <ui/control.h>
+#include <common/event.h>
 
 
 const int MAXWINDOW = 100;
@@ -48,34 +29,34 @@ const int MAXWINDOW = 100;
 class CWindow : public CControl
 {
 public:
-    CWindow(CInstanceManager* iMan);
+    CWindow();
     ~CWindow();
 
     void        Flush();
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CButton*    CreateButton(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CColor*     CreateColor(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CCheck*     CreateCheck(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CKey*       CreateKey(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CGroup*     CreateGroup(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CImage*     CreateImage(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CLabel*     CreateLabel(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg, char *name);
-    CEdit*      CreateEdit(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CEditValue* CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CScroll*    CreateScroll(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CSlider*    CreateSlider(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CList*      CreateList(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg, float expand=1.2f);
-    CShortcut*  CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CMap*       CreateMap(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CGauge*     CreateGauge(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CCompass*   CreateCompass(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    CTarget*    CreateTarget(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-    bool        DeleteControl(EventMsg eventMsg);
-    CControl*   SearchControl(EventMsg eventMsg);
-
-    EventMsg    RetEventMsgReduce();
-    EventMsg    RetEventMsgFull();
-    EventMsg    RetEventMsgClose();
+    bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CButton*    CreateButton(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CColor*     CreateColor(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CCheck*     CreateCheck(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CKey*       CreateKey(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CGroup*     CreateGroup(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CImage*     CreateImage(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CLabel*     CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, char *name);
+    CEdit*      CreateEdit(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CEditValue* CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CScroll*    CreateScroll(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CSlider*    CreateSlider(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CList*      CreateList(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, float expand=1.2f);
+    CShortcut*  CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CMap*       CreateMap(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CGauge*     CreateGauge(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CCompass*   CreateCompass(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    CTarget*    CreateTarget(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+    bool        DeleteControl(EventType eventMsg);
+    CControl*   SearchControl(EventType eventMsg);
+
+    EventType    RetEventTypeReduce();
+    EventType    RetEventTypeFull();
+    EventType    RetEventTypeClose();
 
     void        SetName(char* name);