Merge branch 'master' into stable

1 files changed, 0 insertions, 61 deletions

diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp
index 322f2ef76..9a328f2cc 100644
--- a/src/guichan/widgets/slider.cpp
+++ b/src/guichan/widgets/slider.cpp
@@ -120,47 +120,6 @@ namespace gcn
         mScaleEnd = scaleEnd;
     }
 
-    void Slider::mousePressed(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.getButton() == gcn::MouseEvent::LEFT
-            && mouseEvent.getX() >= 0
-            && mouseEvent.getX() <= getWidth()
-            && mouseEvent.getY() >= 0
-            && mouseEvent.getY() <= getHeight())
-        {
-            if (getOrientation() == HORIZONTAL)
-            {
-                setValue(markerPositionToValue(
-                    mouseEvent.getX() - getMarkerLength() / 2));
-            }
-            else
-            {
-                setValue(markerPositionToValue(getHeight()
-                    - mouseEvent.getY() - getMarkerLength() / 2));
-            }
-
-            distributeActionEvent();
-        }
-    }
-
-    void Slider::mouseDragged(MouseEvent& mouseEvent)
-    {
-        if (getOrientation() == HORIZONTAL)
-        {
-            setValue(markerPositionToValue(mouseEvent.getX()
-                - getMarkerLength() / 2));
-        }
-        else
-        {
-            setValue(markerPositionToValue(getHeight()
-                - mouseEvent.getY() - getMarkerLength() / 2));
-        }
-
-        distributeActionEvent();
-
-        mouseEvent.consume();
-    }
-
     void Slider::setValue(double value)
     {
         if (value > getScaleEnd())
@@ -193,10 +152,6 @@ namespace gcn
         mMarkerLength = length;
     }
 
-    void Slider::keyPressed(KeyEvent& keyEvent A_UNUSED)
-    {
-    }
-
     void Slider::setOrientation(Slider::Orientation orientation)
     {
         mOrientation = orientation;
@@ -254,20 +209,4 @@ namespace gcn
     {
         return valueToMarkerPosition(getValue());
     }
-
-    void Slider::mouseWheelMovedUp(MouseEvent& mouseEvent)
-    {
-        setValue(getValue() + getStepLength());
-        distributeActionEvent();
-
-        mouseEvent.consume();
-    }
-
-    void Slider::mouseWheelMovedDown(MouseEvent& mouseEvent)
-    {
-        setValue(getValue() - getStepLength());
-        distributeActionEvent();
-
-        mouseEvent.consume();
-    }
 }  // namespace gcn