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, 34 insertions, 37 deletions

diff --git a/src/ui/scroll.h b/src/ui/scroll.h
index 6854e61..289d309 100644
--- a/src/ui/scroll.h
+++ b/src/ui/scroll.h
@@ -19,12 +19,9 @@
 #pragma once
 
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
-class CButton;
+#include <ui/control.h>
 
+#include <common/event.h>
 
 const float SCROLL_WIDTH = (15.0f/640.0f);
 
@@ -32,50 +29,50 @@ const float SCROLL_WIDTH = (15.0f/640.0f);
 
 class CScroll : public CControl
 {
-public:
-    CScroll(CInstanceManager* iMan);
-    ~CScroll();
+    public:
+        CScroll();
+        ~CScroll();
 
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
+        bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
 
-    void        SetPos(Math::Point pos);
-    void        SetDim(Math::Point dim);
+        void        SetPos(Math::Point pos);
+        void        SetDim(Math::Point dim);
 
-    bool        SetState(int state, bool bState);
-    bool        SetState(int state);
-    bool        ClearState(int state);
+        bool        SetState(int state, bool bState);
+        bool        SetState(int state);
+        bool        ClearState(int state);
 
-    bool        EventProcess(const Event &event);
-    void        Draw();
+        bool        EventProcess(const Event &event);
+        void        Draw();
 
-    void        SetVisibleValue(float value);
-    float       RetVisibleValue();
+        void        SetVisibleValue(float value);
+        float       GetVisibleValue();
 
-    void        SetVisibleRatio(float value);
-    float       RetVisibleRatio();
+        void        SetVisibleRatio(float value);
+        float       GetVisibleRatio();
 
-    void        SetArrowStep(float step);
-    float       RetArrowStep();
+        void        SetArrowStep(float step);
+        float       GetArrowStep();
 
-protected:
-    void        MoveAdjust();
-    void        AdjustGlint();
-    void        DrawVertex(Math::Point pos, Math::Point dim, int icon);
+    protected:
+        void        MoveAdjust();
+        void        AdjustGlint();
+        void        DrawVertex(Math::Point pos, Math::Point dim, int icon);
 
-protected:
-    CButton*    m_buttonUp;
-    CButton*    m_buttonDown;
+    protected:
+        CButton*    m_buttonUp;
+        CButton*    m_buttonDown;
 
-    float       m_visibleValue;
-    float       m_visibleRatio;
-    float       m_step;
+        float       m_visibleValue;
+        float       m_visibleRatio;
+        float       m_step;
 
-    bool        m_bCapture;
-    Math::Point     m_pressPos;
-    float       m_pressValue;
+        bool        m_bCapture;
+        Math::Point     m_pressPos;
+        float       m_pressValue;
 
-    EventMsg    m_eventUp;
-    EventMsg    m_eventDown;
+        EventType    m_eventUp;
+        EventType    m_eventDown;
 };