added ui/slider.*

2 files changed, 14 insertions, 9 deletions

diff --git a/src/ui/slider.cpp b/src/ui/slider.cpp
index 3c5b1ba..c90a047 100644
--- a/src/ui/slider.cpp
+++ b/src/ui/slider.cpp
@@ -35,6 +35,7 @@
 #include "ui/slider.h"
 
 
+namespace Ui {
 
 const float CURSOR_WIDTH    = (10.0f/640.0f);
 const float HOLE_WIDTH      = (5.0f/480.0f);
@@ -44,7 +45,7 @@ const float HOLE_WIDTH      = (5.0f/480.0f);
 
 // Object's constructor.
 
-CSlider::CSlider(CInstanceManager* iMan) : CControl(iMan)
+CSlider::CSlider() : CControl()
 {
     m_buttonLeft  = 0;
     m_buttonRight = 0;
@@ -118,7 +119,7 @@ void CSlider::MoveAdjust()
 #if 1
         if ( m_buttonLeft == 0 )
         {
-            m_buttonLeft = new CButton(m_iMan);
+            m_buttonLeft = new CButton();
             m_buttonLeft->Create(Math::Point(0.0f, 0.0f), Math::Point(0.0f, 0.0f), m_bHoriz?55:49, EVENT_NULL);  // </^
             m_buttonLeft->SetRepeat(true);
             if ( m_state & STATE_SHADOW )  m_buttonLeft->SetState(STATE_SHADOW);
@@ -127,7 +128,7 @@ void CSlider::MoveAdjust()
 
         if ( m_buttonRight == 0 )
         {
-            m_buttonRight = new CButton(m_iMan);
+            m_buttonRight = new CButton();
             m_buttonRight->Create(Math::Point(0.0f, 0.0f), Math::Point(0.0f, 0.0f), m_bHoriz?48:50, EVENT_NULL);  // >/v
             m_buttonRight->SetRepeat(true);
             if ( m_state & STATE_SHADOW )  m_buttonRight->SetState(STATE_SHADOW);
@@ -360,9 +361,9 @@ bool CSlider::EventProcess(const Event &event)
     {
         m_bCapture = false;
     }
-/*/TODO */
+
     if ( event.type == EVENT_KEY_DOWN &&
-         event.param == VK_WHEELUP    &&
+         event.mouseButton.button == 4    &&
          Detect(event.pos)            &&
          m_buttonLeft != 0            )
     {
@@ -370,9 +371,9 @@ bool CSlider::EventProcess(const Event &event)
         newEvent.type = m_buttonLeft->GetEventType();
         m_event->AddEvent(newEvent);
     }
-/*/TODO */
+
     if ( event.type == EVENT_KEY_DOWN &&
-         event.param == VK_WHEELDOWN  &&
+         event.mouseButton.button == 5  &&
          Detect(event.pos)            &&
          m_buttonRight != 0           )
     {
@@ -585,3 +586,4 @@ float CSlider::GetArrowStep()
 }
 
 
+}
diff --git a/src/ui/slider.h b/src/ui/slider.h
index e79b348..0de9b3c 100644
--- a/src/ui/slider.h
+++ b/src/ui/slider.h
@@ -1,5 +1,6 @@
 // * This file is part of the COLOBOT source code
 // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
+// * Copyright (C) 2012, Polish Portal of Colobot (PPC)
 // *
 // * This program is free software: you can redistribute it and/or modify
 // * it under the terms of the GNU General Public License as published by
@@ -23,6 +24,7 @@
 
 #include <common/event.h>
 
+namespace Ui {
 
 class CSlider : public CControl
 {
@@ -45,10 +47,10 @@ class CSlider : public CControl
         void        SetLimit(float min, float max);
 
         void        SetVisibleValue(float value);
-        float       RetVisibleValue();
+        float       GetVisibleValue();
 
         void        SetArrowStep(float step);
-        float       RetArrowStep();
+        float       GetArrowStep();
 
     protected:
         void        MoveAdjust();
@@ -76,3 +78,4 @@ class CSlider : public CControl
 };
 
 
+}