Merge scrollarea classes into one.

24 files changed, 824 insertions, 1207 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 967149917..7b5199d1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -811,7 +811,6 @@ SET(SRCS
     gui/widgets/widget.h
     listeners/widgetlistener.h
     gui/base/widgets/container.hpp
-    gui/base/widgets/scrollarea.hpp
     gui/base/widgets/slider.hpp
     gui/base/widgets/textbox.hpp
     gui/base/widgets/textfield.hpp
@@ -822,7 +821,6 @@ SET(SRCS
     gui/rect.cpp
     gui/widgets/widget.cpp
     gui/base/widgets/container.cpp
-    gui/base/widgets/scrollarea.cpp
     gui/base/widgets/slider.cpp
     gui/base/widgets/textbox.cpp
     gui/base/widgets/textfield.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 5272a1778..fb901ee83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,7 +174,6 @@ manaplus_SOURCES += events/actionevent.h \
 	      gui/widgets/widget.h \
 	      listeners/widgetlistener.h \
 	      gui/base/widgets/container.hpp \
-	      gui/base/widgets/scrollarea.hpp \
 	      gui/base/widgets/slider.hpp \
 	      gui/base/widgets/textbox.hpp \
 	      gui/base/widgets/textfield.hpp \
@@ -185,7 +184,6 @@ manaplus_SOURCES += events/actionevent.h \
 	      gui/rect.cpp \
 	      gui/widgets/widget.cpp \
 	      gui/base/widgets/container.cpp \
-	      gui/base/widgets/scrollarea.cpp \
 	      gui/base/widgets/slider.cpp \
 	      gui/base/widgets/textbox.cpp \
 	      gui/base/widgets/textfield.cpp
diff --git a/src/gui/base/widgets/scrollarea.cpp b/src/gui/base/widgets/scrollarea.cpp
deleted file mode 100644
index 3c830c239..000000000
--- a/src/gui/base/widgets/scrollarea.cpp
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "gui/base/widgets/scrollarea.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-    ScrollArea::ScrollArea(const Widget2 *const widget) :
-        BasicContainer(widget),
-        MouseListener(),
-        mVScroll(0),
-        mHScroll(0),
-        mScrollbarWidth(12),
-        mHPolicy(SHOW_AUTO),
-        mVPolicy(SHOW_AUTO),
-        mVBarVisible(false),
-        mHBarVisible(false),
-        mUpButtonPressed(false),
-        mDownButtonPressed(false),
-        mLeftButtonPressed(false),
-        mRightButtonPressed(false),
-        mUpButtonScrollAmount(10),
-        mDownButtonScrollAmount(10),
-        mLeftButtonScrollAmount(10),
-        mRightButtonScrollAmount(10),
-        mIsVerticalMarkerDragged(false),
-        mIsHorizontalMarkerDragged(false),
-        mHorizontalMarkerDragOffset(0),
-        mVerticalMarkerDragOffset(0),
-        mOpaque(true)
-    {
-        addMouseListener(this);
-    }
-
-    ScrollArea::ScrollArea(const Widget2 *const widget,
-                           Widget *const content) :
-        BasicContainer(widget),
-        MouseListener(),
-        mVScroll(0),
-        mHScroll(0),
-        mScrollbarWidth(12),
-        mHPolicy(SHOW_AUTO),
-        mVPolicy(SHOW_AUTO),
-        mVBarVisible(false),
-        mHBarVisible(false),
-        mUpButtonPressed(false),
-        mDownButtonPressed(false),
-        mLeftButtonPressed(false),
-        mRightButtonPressed(false),
-        mUpButtonScrollAmount(10),
-        mDownButtonScrollAmount(10),
-        mLeftButtonScrollAmount(10),
-        mRightButtonScrollAmount(10),
-        mIsVerticalMarkerDragged(false),
-        mIsHorizontalMarkerDragged(false),
-        mHorizontalMarkerDragOffset(0),
-        mVerticalMarkerDragOffset(0),
-        mOpaque(true)
-    {
-        setContent(content);
-        addMouseListener(this);
-    }
-
-    ScrollArea::ScrollArea(const Widget2 *const widget,
-                           Widget *content,
-                           ScrollPolicy hPolicy,
-                           ScrollPolicy vPolicy) :
-        BasicContainer(widget),
-        MouseListener(),
-        mVScroll(0),
-        mHScroll(0),
-        mScrollbarWidth(12),
-        mHPolicy(hPolicy),
-        mVPolicy(vPolicy),
-        mVBarVisible(false),
-        mHBarVisible(false),
-        mUpButtonPressed(false),
-        mDownButtonPressed(false),
-        mLeftButtonPressed(false),
-        mRightButtonPressed(false),
-        mUpButtonScrollAmount(10),
-        mDownButtonScrollAmount(10),
-        mLeftButtonScrollAmount(10),
-        mRightButtonScrollAmount(10),
-        mIsVerticalMarkerDragged(false),
-        mIsHorizontalMarkerDragged(false),
-        mHorizontalMarkerDragOffset(0),
-        mVerticalMarkerDragOffset(0),
-        mOpaque(true)
-    {
-        setContent(content);
-        addMouseListener(this);
-    }
-
-    ScrollArea::~ScrollArea()
-    {
-        setContent(nullptr);
-    }
-
-    void ScrollArea::setContent(Widget* widget)
-    {
-        if (widget)
-        {
-            clear();
-            add(widget);
-            widget->setPosition(0, 0);
-        }
-        else
-        {
-            clear();
-        }
-
-        checkPolicies();
-    }
-
-    Widget* ScrollArea::getContent()
-    {
-        if (!mWidgets.empty())
-            return *mWidgets.begin();
-
-        return nullptr;
-    }
-
-    void ScrollArea::setHorizontalScrollPolicy(ScrollPolicy hPolicy)
-    {
-        mHPolicy = hPolicy;
-        checkPolicies();
-    }
-
-    ScrollArea::ScrollPolicy ScrollArea::getHorizontalScrollPolicy() const
-    {
-        return mHPolicy;
-    }
-
-    void ScrollArea::setVerticalScrollPolicy(ScrollPolicy vPolicy)
-    {
-        mVPolicy = vPolicy;
-        checkPolicies();
-    }
-
-    ScrollArea::ScrollPolicy ScrollArea::getVerticalScrollPolicy() const
-    {
-        return mVPolicy;
-    }
-
-    void ScrollArea::setScrollPolicy(ScrollPolicy hPolicy,
-                                     ScrollPolicy vPolicy)
-    {
-        mHPolicy = hPolicy;
-        mVPolicy = vPolicy;
-        checkPolicies();
-    }
-
-    void ScrollArea::setVerticalScrollAmount(int vScroll)
-    {
-        const int max = getVerticalMaxScroll();
-
-        mVScroll = vScroll;
-
-        if (vScroll > max)
-            mVScroll = max;
-
-        if (vScroll < 0)
-            mVScroll = 0;
-    }
-
-    int ScrollArea::getVerticalScrollAmount() const
-    {
-        return mVScroll;
-    }
-
-    void ScrollArea::setHorizontalScrollAmount(int hScroll)
-    {
-        const int max = getHorizontalMaxScroll();
-
-        mHScroll = hScroll;
-
-        if (hScroll > max)
-            mHScroll = max;
-        else if (hScroll < 0)
-            mHScroll = 0;
-    }
-
-    int ScrollArea::getHorizontalScrollAmount() const
-    {
-        return mHScroll;
-    }
-
-    void ScrollArea::setScrollAmount(int hScroll, int vScroll)
-    {
-        setHorizontalScrollAmount(hScroll);
-        setVerticalScrollAmount(vScroll);
-    }
-
-    int ScrollArea::getHorizontalMaxScroll()
-    {
-        checkPolicies();
-
-        const Widget *const content = getContent();
-        if (!content)
-            return 0;
-
-        const int value = content->getWidth() - getChildrenArea().width +
-            2 * content->getFrameSize();
-
-        if (value < 0)
-            return 0;
-
-        return value;
-    }
-
-    int ScrollArea::getVerticalMaxScroll()
-    {
-        checkPolicies();
-
-        const Widget *const content = getContent();
-        if (!content)
-            return 0;
-
-        int value;
-
-        value = content->getHeight() - getChildrenArea().height +
-            2 * content->getFrameSize();
-
-        if (value < 0)
-            return 0;
-
-        return value;
-    }
-
-    void ScrollArea::setScrollbarWidth(int width)
-    {
-        if (width > 0)
-            mScrollbarWidth = width;
-    }
-
-    int ScrollArea::getScrollbarWidth() const
-    {
-        return mScrollbarWidth;
-    }
-
-    void ScrollArea::mouseReleased(MouseEvent& mouseEvent)
-    {
-        mUpButtonPressed = false;
-        mDownButtonPressed = false;
-        mLeftButtonPressed = false;
-        mRightButtonPressed = false;
-        mIsHorizontalMarkerDragged = false;
-        mIsVerticalMarkerDragged = false;
-
-        mouseEvent.consume();
-    }
-
-    void ScrollArea::draw(Graphics *graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::drawHBar(Graphics* graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::drawVBar(Graphics* graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::drawBackground(Graphics *graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::drawUpButton(Graphics* graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::drawDownButton(Graphics* graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::drawLeftButton(Graphics* graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::drawRightButton(Graphics* graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::drawVMarker(Graphics* graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::drawHMarker(Graphics* graphics A_UNUSED)
-    {
-    }
-
-    void ScrollArea::logic()
-    {
-        BLOCK_START("ScrollArea::logic")
-        checkPolicies();
-
-        setVerticalScrollAmount(getVerticalScrollAmount());
-        setHorizontalScrollAmount(getHorizontalScrollAmount());
-
-        Widget *const content = getContent();
-        if (content)
-        {
-            const int frameSize = content->getFrameSize();
-            content->setPosition(-mHScroll + frameSize, -mVScroll + frameSize);
-            content->logic();
-        }
-        BLOCK_END("ScrollArea::logic")
-    }
-
-    void ScrollArea::checkPolicies()
-    {
-        const int w = getWidth();
-        const int h = getHeight();
-
-        mHBarVisible = false;
-        mVBarVisible = false;
-
-        const Widget *const content = getContent();
-        if (!content)
-        {
-            mHBarVisible = (mHPolicy == SHOW_ALWAYS);
-            mVBarVisible = (mVPolicy == SHOW_ALWAYS);
-            return;
-        }
-
-        if (mHPolicy == SHOW_AUTO &&
-            mVPolicy == SHOW_AUTO)
-        {
-            if (content->getWidth() <= w
-                && content->getHeight() <= h)
-            {
-                mHBarVisible = false;
-                mVBarVisible = false;
-            }
-
-            if (content->getWidth() > w)
-            {
-                mHBarVisible = true;
-            }
-
-            if ((content->getHeight() > h)
-                || (mHBarVisible && content->getHeight()
-                > h - mScrollbarWidth))
-            {
-                mVBarVisible = true;
-            }
-
-            if (mVBarVisible && content->getWidth() > w - mScrollbarWidth)
-                mHBarVisible = true;
-
-            return;
-        }
-
-        switch (mHPolicy)
-        {
-            case SHOW_NEVER:
-                mHBarVisible = false;
-                break;
-
-            case SHOW_ALWAYS:
-                mHBarVisible = true;
-                break;
-
-            case SHOW_AUTO:
-                if (mVPolicy == SHOW_NEVER)
-                {
-                    mHBarVisible = (content->getWidth() > w);
-                }
-                else  // (mVPolicy == SHOW_ALWAYS)
-                {
-                    mHBarVisible = (content->getWidth()
-                        > w - mScrollbarWidth);
-                }
-                break;
-
-            default:
-                break;
-        }
-
-        switch (mVPolicy)
-        {
-            case SHOW_NEVER:
-                mVBarVisible = false;
-                break;
-
-            case SHOW_ALWAYS:
-                mVBarVisible = true;
-                break;
-
-            case SHOW_AUTO:
-                if (mHPolicy == SHOW_NEVER)
-                {
-                    mVBarVisible = (content->getHeight() > h);
-                }
-                else  // (mHPolicy == SHOW_ALWAYS)
-                {
-                    mVBarVisible = (content->getHeight()
-                        > h - mScrollbarWidth);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    Rect ScrollArea::getChildrenArea()
-    {
-        const Rect area = Rect(0, 0,
-            mVBarVisible ? (getWidth() - mScrollbarWidth) : getWidth(),
-            mHBarVisible ? (getHeight() - mScrollbarWidth) : getHeight());
-
-        if (area.width < 0 || area.height < 0)
-            return Rect();
-
-        return area;
-    }
-
-    void ScrollArea::showWidgetPart(Widget* widget, Rect area)
-    {
-        const Widget *const content = getContent();
-        if (widget != content)
-            return;
-
-        BasicContainer::showWidgetPart(widget, area);
-
-        setHorizontalScrollAmount(content->getFrameSize()
-            - content->getX());
-        setVerticalScrollAmount(content->getFrameSize()
-            - content->getY());
-    }
-
-    Widget *ScrollArea::getWidgetAt(int x, int y)
-    {
-        if (getChildrenArea().isPointInRect(x, y))
-            return getContent();
-
-        return nullptr;
-    }
-
-    void ScrollArea::mouseWheelMovedUp(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.isConsumed())
-            return;
-
-        setVerticalScrollAmount(getVerticalScrollAmount()
-            - getChildrenArea().height / 8);
-
-        mouseEvent.consume();
-    }
-
-    void ScrollArea::mouseWheelMovedDown(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.isConsumed())
-            return;
-
-        setVerticalScrollAmount(getVerticalScrollAmount()
-            + getChildrenArea().height / 8);
-
-        mouseEvent.consume();
-    }
-
-    void ScrollArea::setWidth(int width)
-    {
-        Widget::setWidth(width);
-        checkPolicies();
-    }
-
-    void ScrollArea::setHeight(int height)
-    {
-        Widget::setHeight(height);
-        checkPolicies();
-    }
-
-    void ScrollArea::setDimension(const Rect& dimension)
-    {
-        Widget::setDimension(dimension);
-        checkPolicies();
-    }
-
-    void ScrollArea::setLeftButtonScrollAmount(int amount)
-    {
-        mLeftButtonScrollAmount = amount;
-    }
-
-    void ScrollArea::setRightButtonScrollAmount(int amount)
-    {
-        mRightButtonScrollAmount = amount;
-    }
-
-    void ScrollArea::setUpButtonScrollAmount(int amount)
-    {
-        mUpButtonScrollAmount = amount;
-    }
-
-    void ScrollArea::setDownButtonScrollAmount(int amount)
-    {
-        mDownButtonScrollAmount = amount;
-    }
-
-    int ScrollArea::getLeftButtonScrollAmount() const
-    {
-        return mLeftButtonScrollAmount;
-    }
-
-    int ScrollArea::getRightButtonScrollAmount() const
-    {
-        return mRightButtonScrollAmount;
-    }
-
-    int ScrollArea::getUpButtonScrollAmount() const
-    {
-        return mUpButtonScrollAmount;
-    }
-
-    int ScrollArea::getDownButtonScrollAmount() const
-    {
-        return mDownButtonScrollAmount;
-    }
-
-    void ScrollArea::setOpaque(bool opaque)
-    {
-        mOpaque = opaque;
-    }
-
-    bool ScrollArea::isOpaque() const
-    {
-        return mOpaque;
-    }
-}  // namespace gcn
diff --git a/src/gui/base/widgets/scrollarea.hpp b/src/gui/base/widgets/scrollarea.hpp
deleted file mode 100644
index 624debc35..000000000
--- a/src/gui/base/widgets/scrollarea.hpp
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2011-2014  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  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
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_SCROLLAREA_HPP
-#define GCN_SCROLLAREA_HPP
-
-#include "gui/widgets/basiccontainer.h"
-
-#include "listeners/mouselistener.h"
-
-namespace gcn
-{
-    /**
-     * Implementation if a scrollable area used to view widgets larger than the scroll area.
-     * A scroll area can be customized to always show scroll bars or to show them only when
-     * necessary.
-     */
-    class ScrollArea:
-        public BasicContainer,
-        public MouseListener
-    {
-    public:
-        /**
-         * Scrollpolicies for the horizontal and vertical scrollbar.
-         * The policies are:
-         *
-         * SHOW_ALWAYS - Always show the scrollbars no matter what.
-         * SHOW_NEVER  - Never show the scrollbars no matter waht.
-         * SHOW_AUTO   - Show the scrollbars only when needed. That is if the
-         *               content grows larger then the ScrollArea.
-         */
-        enum ScrollPolicy
-        {
-            SHOW_ALWAYS = 0,
-            SHOW_NEVER,
-            SHOW_AUTO
-        };
-
-        /**
-         * Constructor.
-         */
-        explicit ScrollArea(const Widget2 *const widget);
-
-        /**
-         * Constructor.
-         *
-         * @param content The content of the scroll area.
-         */
-        ScrollArea(const Widget2 *const widget,
-                   Widget *const content);
-
-        /**
-         * Constructor.
-         *
-         * @param content The content of the scroll area.
-         * @param hPolicy The policy for the horizontal scrollbar. See enum with
-         *                policies.
-         * @param vPolicy The policy for the vertical scrollbar. See enum with
-         *                policies.
-         */
-        ScrollArea(const Widget2 *const widget,
-                   Widget *content,
-                   ScrollPolicy hPolicy,
-                   ScrollPolicy vPolicy);
-
-        A_DELETE_COPY(ScrollArea)
-
-        /**
-         * Destructor.
-         */
-        virtual ~ScrollArea();
-
-        /**
-         * Sets the content.
-         *
-         * @param widget The content of the scroll area.
-         */
-        void setContent(Widget* widget);
-
-        /**
-         * Gets the content.
-         *
-         * @return The content of the scroll area.
-         */
-        Widget* getContent();
-
-        /**
-         * Sets the horizontal scrollbar policy. See enum with policies.
-         *
-         * @param hPolicy The policy for the horizontal scrollbar.
-         * @see getHorizontalScrollPolicy
-         */
-        void setHorizontalScrollPolicy(ScrollPolicy hPolicy);
-
-        /**
-         * Gets the horizontal scrollbar policy. See enum with policies.
-         *
-         * @return The policy for the horizontal scrollbar policy.
-         * @see setHorizontalScrollPolicy, setScrollPolicy
-         */
-        ScrollPolicy getHorizontalScrollPolicy() const;
-
-        /**
-         * Sets the vertical scrollbar policy. See enum with policies.
-         *
-         * @param vPolicy The policy for the vertical scrollbar.
-         * @see getVerticalScrollPolicy
-         */
-        void setVerticalScrollPolicy(ScrollPolicy vPolicy);
-
-        /**
-         * Gets the vertical scrollbar policy. See enum with policies.
-         *
-         * @return The policy for the vertical scrollbar.
-         * @see setVerticalScrollPolicy, setScrollPolicy
-         */
-        ScrollPolicy getVerticalScrollPolicy() const;
-
-        /**
-         * Sets the horizontal and vertical scrollbar policy.
-         *
-         * @param hPolicy The policy for the horizontal scrollbar.
-         * @param vPolicy The policy for the vertical scrollbar.
-         * @see getVerticalScrollPolicy, getHorizontalScrollPolicy
-         */
-        void setScrollPolicy(ScrollPolicy hPolicy, ScrollPolicy vPolicy);
-
-        /**
-         * Sets the amount to scroll vertically.
-         *
-         * @param vScroll The amount to scroll.
-         * @see getVerticalScrollAmount
-         */
-        void setVerticalScrollAmount(int vScroll);
-
-        /**
-         * Gets the amount that is scrolled vertically.
-         *
-         * @return The scroll amount on vertical scroll.
-         * @see setVerticalScrollAmount, setScrollAmount
-         */
-        int getVerticalScrollAmount() const;
-
-        /**
-         * Sets the amount to scroll horizontally.
-         *
-         * @param hScroll The amount to scroll.
-         * @see getHorizontalScrollAmount
-         */
-        void setHorizontalScrollAmount(int hScroll);
-
-        /**
-         * Gets the amount that is scrolled horizontally.
-         *
-         * @return The scroll amount on horizontal scroll.
-         * @see setHorizontalScrollAmount, setScrollAmount
-         */
-        int getHorizontalScrollAmount() const;
-
-        /**
-         * Sets the amount to scroll horizontally and vertically.
-         *
-         * @param hScroll The amount to scroll on horizontal scroll.
-         * @param vScroll The amount to scroll on vertical scroll.
-         * @see getHorizontalScrollAmount, getVerticalScrollAmount
-         */
-        void setScrollAmount(int hScroll, int vScroll);
-
-        /**
-         * Gets the maximum amount of horizontal scroll.
-         *
-         * @return The horizontal max scroll.
-         */
-        int getHorizontalMaxScroll();
-
-        /**
-         * Gets the maximum amount of vertical scroll.
-         *
-         * @return The vertical max scroll.
-         */
-        int getVerticalMaxScroll();
-
-        /**
-         * Sets the width of the scroll bars.
-         *
-         * @param width The width of the scroll bars.
-         * @see getScrollbarWidth
-         */
-        void setScrollbarWidth(int width);
-
-        /**
-         * Gets the width of the scroll bars.
-         *
-         * @return the width of the ScrollBar.
-         * @see setScrollbarWidth
-         */
-        int getScrollbarWidth() const;
-
-        /**
-         * Sets the amount to scroll in pixels when the left scroll button is
-         * pushed.
-         *
-         * @param amount The amount to scroll in pixels. 
-         * @see getLeftButtonScrollAmount
-         */
-        void setLeftButtonScrollAmount(int amount);
-
-        /**
-         * Sets the amount to scroll in pixels when the right scroll button is
-         * pushed.
-         *
-         * @param amount The amount to scroll in pixels.
-         * @see getRightButtonScrollAmount
-         */
-        void setRightButtonScrollAmount(int amount);
-
-        /**
-         * Sets the amount to scroll in pixels when the up scroll button is
-         * pushed.
-         *
-         * @param amount The amount to scroll in pixels.
-         * @see getUpButtonScrollAmount
-         */
-        void setUpButtonScrollAmount(int amount);
-
-        /**
-         * Sets the amount to scroll in pixels when the down scroll button is
-         * pushed.
-         *
-         * @param amount The amount to scroll in pixels.
-         * @see getDownButtonScrollAmount
-         */
-        void setDownButtonScrollAmount(int amount);
-
-        /**
-         * Gets the amount to scroll in pixels when the left scroll button is
-         * pushed.
-         *
-         * @return The amount to scroll in pixels.
-         * @see setLeftButtonScrollAmount
-         */
-        int getLeftButtonScrollAmount() const;
-
-        /**
-         * Gets the amount to scroll in pixels when the right scroll button is
-         * pushed.
-         *
-         * @return The amount to scroll in pixels.
-         * @see setRightButtonScrollAmount
-         */
-        int getRightButtonScrollAmount() const;
-
-        /**
-         * Gets the amount to scroll in pixels when the up scroll button is
-         * pushed.
-         *
-         * @return The amount to scroll in pixels.
-         * @see setUpButtonScrollAmount
-         */
-        int getUpButtonScrollAmount() const;
-
-        /**
-         * Gets the amount to scroll in pixels when the down scroll button is
-         * pushed.
-         *
-         * @return The amount to scroll in pixels.
-         * @see setDownButtonScrollAmount
-         */
-        int getDownButtonScrollAmount() const;
-
-        /**
-         * Sets the scroll area to be opaque, that is sets the scoll area
-         * to display its background.
-         *
-         * @param opaque True if the scoll area should be opaque, false otherwise.
-         */
-        void setOpaque(bool opaque);
-
-        /**
-         * Checks if the scroll area is opaque, that is if the scroll area
-         * displays its background.
-         *
-         * @return True if the scroll area is opaque, false otherwise.
-         */
-        bool isOpaque() const;
-
-        // Inherited from BasicContainer
-
-        virtual void showWidgetPart(Widget* widget, Rect area);
-
-        virtual Rect getChildrenArea();
-
-        virtual Widget *getWidgetAt(int x, int y);
-
-
-        // Inherited from Widget
-
-        virtual void draw(Graphics *graphics);
-
-        virtual void logic();
-
-        void setWidth(int width);
-
-        void setHeight(int height);
-
-        void setDimension(const Rect& dimension);
-
-
-        // Inherited from MouseListener
-
-        virtual void mouseReleased(MouseEvent& mouseEvent) override;
-
-        virtual void mouseWheelMovedUp(MouseEvent& mouseEvent) override;
-
-        virtual void mouseWheelMovedDown(MouseEvent& mouseEvent) override;
-
-    protected:
-        /**
-         * Draws the background of the scroll area, that is
-         * the area behind the content.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawBackground(Graphics *graphics);
-
-        /**
-         * Draws the up button.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawUpButton(Graphics *graphics);
-
-        /**
-         * Draws the down button.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawDownButton(Graphics *graphics);
-
-        /**
-         * Draws the left button.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawLeftButton(Graphics *graphics);
-
-        /**
-         * Draws the right button.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawRightButton(Graphics *graphics);
-
-        /**
-         * Draws the vertical scroll bar.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawVBar(Graphics* graphics);
-
-        /**
-         * Draws the horizontal scroll bar.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawHBar(Graphics* graphics);
-
-        /**
-         * Draws the vertical marker.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawVMarker(Graphics* graphics);
-
-        /**
-         * Draws the horizontal marker.
-         *
-         * @param graphics a Graphics object to draw with.
-         */
-        virtual void drawHMarker(Graphics* graphics);
-
-        /**
-         * Checks the policies for the scroll bars.
-         */
-        virtual void checkPolicies();
-
-        /**
-         * Holds the vertical scroll amount.
-         */
-        int mVScroll;
-
-        /**
-         * Holds the horizontal scroll amount.
-         */
-        int mHScroll;
-
-        /**
-         * Holds the width of the scroll bars.
-         */
-        int mScrollbarWidth;
-
-        /**
-         * Holds the horizontal scroll bar policy.
-         */
-        ScrollPolicy mHPolicy;
-
-        /**
-         * Holds the vertical scroll bar policy.
-         */
-        ScrollPolicy mVPolicy;
-
-        /**
-         * True if the vertical scroll bar is visible, false otherwise.
-         */
-        bool mVBarVisible;
-
-        /**
-         * True if the horizontal scroll bar is visible, false otherwise.
-         */
-        bool mHBarVisible;
-
-        /**
-         * True if the up button is pressed, false otherwise.
-         */
-        bool mUpButtonPressed;
-
-        /**
-         * True if the down button is pressed, false otherwise.
-         */
-        bool mDownButtonPressed;
-
-        /**
-         * True if the left button is pressed, false otherwise.
-         */
-        bool mLeftButtonPressed;
-
-        /**
-         * True if the right button is pressed, false otherwise.
-         */
-        bool mRightButtonPressed;
-
-        /**
-         * Holds the up button scroll amount.
-         */
-        int mUpButtonScrollAmount;
-
-        /**
-         * Holds the down button scroll amount.
-         */
-        int mDownButtonScrollAmount;
-
-        /**
-         * Holds the left button scroll amount.
-         */
-        int mLeftButtonScrollAmount;
-
-        /**
-         * Holds the right button scroll amount.
-         */
-        int mRightButtonScrollAmount;
-
-        /**
-         * True if the vertical marked is dragged.
-         */
-        bool mIsVerticalMarkerDragged;
-
-        /**
-         * True if the horizontal marked is dragged.
-         */
-        bool mIsHorizontalMarkerDragged;
-
-        /**
-         * Holds the horizontal markers drag offset.
-         */
-        int mHorizontalMarkerDragOffset;
-
-        /**
-         * Holds the vertical markers drag offset.
-         */
-        int mVerticalMarkerDragOffset;
-
-        /**
-         * True if the scroll area should be opaque (that is
-         * display its background), false otherwise.
-         */
-        bool mOpaque;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_SCROLLAREA_HPP
diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp
index 48ab683be..d3dd62fc7 100644
--- a/src/gui/widgets/basiccontainer.cpp
+++ b/src/gui/widgets/basiccontainer.cpp
@@ -313,7 +313,7 @@ void BasicContainer::logicChildren()
     BLOCK_END("BasicContainer::logicChildren")
 }
 
-void BasicContainer::showWidgetPart(Widget* widget, Rect area)
+void BasicContainer::showWidgetPart(Widget *const widget, Rect area)
 {
     const Rect widgetArea = getChildrenArea();
 
diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h
index 240e9375f..bf018e0de 100644
--- a/src/gui/widgets/basiccontainer.h
+++ b/src/gui/widgets/basiccontainer.h
@@ -106,7 +106,7 @@ class BasicContainer : public Widget,
           *               itself to be visible.
           * @param rectangle The rectangle to be visible.
           */
-        virtual void showWidgetPart(Widget* widget, Rect area);
+        virtual void showWidgetPart(Widget *const widget, Rect area);
 
         // Inherited from Widget
 
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index dcc3a871b..3c50abca0 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -20,6 +20,49 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "gui/widgets/scrollarea.h"
 
 #include "client.h"
@@ -53,8 +96,29 @@ ScrollArea::ScrollArea(Widget2 *const widget2,
                        Widget *const widget,
                        const bool opaque,
                        const std::string &skin) :
-    gcn::ScrollArea(widget2, widget),
+    BasicContainer(widget2),
+    MouseListener(),
     WidgetListener(),
+    mVScroll(0),
+    mHScroll(0),
+    mScrollbarWidth(12),
+    mHPolicy(SHOW_AUTO),
+    mVPolicy(SHOW_AUTO),
+    mVBarVisible(false),
+    mHBarVisible(false),
+    mUpButtonPressed(false),
+    mDownButtonPressed(false),
+    mLeftButtonPressed(false),
+    mRightButtonPressed(false),
+    mUpButtonScrollAmount(10),
+    mDownButtonScrollAmount(10),
+    mLeftButtonScrollAmount(10),
+    mRightButtonScrollAmount(10),
+    mIsVerticalMarkerDragged(false),
+    mIsHorizontalMarkerDragged(false),
+    mHorizontalMarkerDragOffset(0),
+    mVerticalMarkerDragOffset(0),
+    mOpaque(true),
     mX(0),
     mY(0),
     mClickX(0),
@@ -68,6 +132,8 @@ ScrollArea::ScrollArea(Widget2 *const widget2,
     mHasMouse(false),
     mRedraw(true)
 {
+    setContent(widget);
+    addMouseListener(this);
     mOpaque = opaque;
     init(skin);
 }
@@ -102,6 +168,8 @@ ScrollArea::~ScrollArea()
     mVertexes = nullptr;
     delete mVertexes2;
     mVertexes2 = nullptr;
+
+    setContent(nullptr);
 }
 
 void ScrollArea::init(std::string skinName)
@@ -178,20 +246,30 @@ void ScrollArea::logic()
         return;
     }
 
-    gcn::ScrollArea::logic();
+    checkPolicies();
+
+    setVerticalScrollAmount(getVerticalScrollAmount());
+    setHorizontalScrollAmount(getHorizontalScrollAmount());
+
     Widget *const content = getContent();
+    if (content)
+    {
+        const int frameSize = content->getFrameSize();
+        content->setPosition(-mHScroll + frameSize, -mVScroll + frameSize);
+        content->logic();
+    }
 
     // When no scrollbar in a certain direction, adapt content size to match
     // the content dimension exactly.
     if (content)
     {
         const unsigned int frameSize = 2 * content->getFrameSize();
-        if (mHPolicy == gcn::ScrollArea::SHOW_NEVER)
+        if (mHPolicy == ScrollArea::SHOW_NEVER)
         {
             content->setWidth((mVBarVisible ? (mDimension.width
                 - mScrollbarWidth) : mDimension.width) - frameSize);
         }
-        if (mVPolicy == gcn::ScrollArea::SHOW_NEVER)
+        if (mVPolicy == ScrollArea::SHOW_NEVER)
         {
             content->setHeight((mHBarVisible ? (mDimension.height
                 - mScrollbarWidth) : mDimension.height) - frameSize);
@@ -803,7 +881,13 @@ void ScrollArea::mouseReleased(MouseEvent& event)
                 event.consume();
         }
     }
-    gcn::ScrollArea::mouseReleased(event);
+    mUpButtonPressed = false;
+    mDownButtonPressed = false;
+    mLeftButtonPressed = false;
+    mRightButtonPressed = false;
+    mIsHorizontalMarkerDragged = false;
+    mIsVerticalMarkerDragged = false;
+    event.consume();
     mRedraw = true;
 }
 
@@ -1066,3 +1150,290 @@ Rect ScrollArea::getRightButtonDimension() const
         mScrollbarWidth,
         mScrollbarWidth);
 }
+
+void ScrollArea::setContent(Widget* widget)
+{
+    if (widget)
+    {
+        clear();
+        add(widget);
+        widget->setPosition(0, 0);
+    }
+    else
+    {
+        clear();
+    }
+
+    checkPolicies();
+}
+
+Widget* ScrollArea::getContent()
+{
+    if (!mWidgets.empty())
+        return *mWidgets.begin();
+
+    return nullptr;
+}
+
+void ScrollArea::setHorizontalScrollPolicy(const ScrollPolicy hPolicy)
+{
+    mHPolicy = hPolicy;
+    checkPolicies();
+}
+
+void ScrollArea::setVerticalScrollPolicy(const ScrollPolicy vPolicy)
+{
+    mVPolicy = vPolicy;
+    checkPolicies();
+}
+
+void ScrollArea::setScrollPolicy(const ScrollPolicy hPolicy,
+                                 const ScrollPolicy vPolicy)
+{
+    mHPolicy = hPolicy;
+    mVPolicy = vPolicy;
+    checkPolicies();
+}
+
+void ScrollArea::setVerticalScrollAmount(const int vScroll)
+{
+    const int max = getVerticalMaxScroll();
+
+    mVScroll = vScroll;
+
+    if (vScroll > max)
+        mVScroll = max;
+
+    if (vScroll < 0)
+        mVScroll = 0;
+}
+
+void ScrollArea::setHorizontalScrollAmount(int hScroll)
+{
+    const int max = getHorizontalMaxScroll();
+
+    mHScroll = hScroll;
+
+    if (hScroll > max)
+        mHScroll = max;
+    else if (hScroll < 0)
+        mHScroll = 0;
+}
+
+void ScrollArea::setScrollAmount(const int hScroll, const int vScroll)
+{
+    setHorizontalScrollAmount(hScroll);
+    setVerticalScrollAmount(vScroll);
+}
+
+int ScrollArea::getHorizontalMaxScroll()
+{
+    checkPolicies();
+
+    const Widget *const content = getContent();
+    if (!content)
+        return 0;
+
+    const int value = content->getWidth() - getChildrenArea().width +
+        2 * content->getFrameSize();
+
+    if (value < 0)
+        return 0;
+
+    return value;
+}
+
+int ScrollArea::getVerticalMaxScroll()
+{
+    checkPolicies();
+
+    const Widget *const content = getContent();
+    if (!content)
+        return 0;
+
+    int value;
+
+    value = content->getHeight() - getChildrenArea().height +
+        2 * content->getFrameSize();
+
+    if (value < 0)
+        return 0;
+
+    return value;
+}
+
+void ScrollArea::setScrollbarWidth(const int width)
+{
+    if (width > 0)
+        mScrollbarWidth = width;
+}
+
+void ScrollArea::showWidgetPart(Widget *const widget, Rect area)
+{
+    const Widget *const content = getContent();
+    if (widget != content)
+        return;
+
+    BasicContainer::showWidgetPart(widget, area);
+
+    setHorizontalScrollAmount(content->getFrameSize()
+        - content->getX());
+    setVerticalScrollAmount(content->getFrameSize()
+        - content->getY());
+}
+
+Rect ScrollArea::getChildrenArea()
+{
+    const Rect area = Rect(0, 0,
+        mVBarVisible ? (getWidth() - mScrollbarWidth) : getWidth(),
+        mHBarVisible ? (getHeight() - mScrollbarWidth) : getHeight());
+
+    if (area.width < 0 || area.height < 0)
+        return Rect();
+
+    return area;
+}
+
+Widget *ScrollArea::getWidgetAt(int x, int y)
+{
+    if (getChildrenArea().isPointInRect(x, y))
+        return getContent();
+
+    return nullptr;
+}
+
+void ScrollArea::setWidth(int width)
+{
+    Widget::setWidth(width);
+    checkPolicies();
+}
+
+void ScrollArea::setHeight(int height)
+{
+    Widget::setHeight(height);
+    checkPolicies();
+}
+
+void ScrollArea::setDimension(const Rect& dimension)
+{
+    Widget::setDimension(dimension);
+    checkPolicies();
+}
+
+void ScrollArea::mouseWheelMovedUp(MouseEvent& mouseEvent)
+{
+    if (mouseEvent.isConsumed())
+        return;
+
+    setVerticalScrollAmount(getVerticalScrollAmount()
+        - getChildrenArea().height / 8);
+
+    mouseEvent.consume();
+}
+
+void ScrollArea::mouseWheelMovedDown(MouseEvent& mouseEvent)
+{
+    if (mouseEvent.isConsumed())
+        return;
+
+    setVerticalScrollAmount(getVerticalScrollAmount()
+        + getChildrenArea().height / 8);
+
+    mouseEvent.consume();
+}
+
+void ScrollArea::checkPolicies()
+{
+    const int w = getWidth();
+    const int h = getHeight();
+
+    mHBarVisible = false;
+    mVBarVisible = false;
+
+    const Widget *const content = getContent();
+    if (!content)
+    {
+        mHBarVisible = (mHPolicy == SHOW_ALWAYS);
+        mVBarVisible = (mVPolicy == SHOW_ALWAYS);
+        return;
+    }
+
+    if (mHPolicy == SHOW_AUTO &&
+        mVPolicy == SHOW_AUTO)
+    {
+        if (content->getWidth() <= w
+            && content->getHeight() <= h)
+        {
+            mHBarVisible = false;
+            mVBarVisible = false;
+        }
+
+        if (content->getWidth() > w)
+        {
+            mHBarVisible = true;
+        }
+
+        if ((content->getHeight() > h)
+            || (mHBarVisible && content->getHeight()
+            > h - mScrollbarWidth))
+        {
+            mVBarVisible = true;
+        }
+
+        if (mVBarVisible && content->getWidth() > w - mScrollbarWidth)
+            mHBarVisible = true;
+
+        return;
+    }
+
+    switch (mHPolicy)
+    {
+        case SHOW_NEVER:
+            mHBarVisible = false;
+            break;
+
+        case SHOW_ALWAYS:
+            mHBarVisible = true;
+            break;
+
+        case SHOW_AUTO:
+            if (mVPolicy == SHOW_NEVER)
+            {
+                mHBarVisible = (content->getWidth() > w);
+            }
+            else  // (mVPolicy == SHOW_ALWAYS)
+            {
+                mHBarVisible = (content->getWidth()
+                    > w - mScrollbarWidth);
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    switch (mVPolicy)
+    {
+        case SHOW_NEVER:
+            mVBarVisible = false;
+            break;
+
+        case SHOW_ALWAYS:
+            mVBarVisible = true;
+            break;
+
+        case SHOW_AUTO:
+            if (mHPolicy == SHOW_NEVER)
+            {
+                mVBarVisible = (content->getHeight() > h);
+            }
+            else  // (mHPolicy == SHOW_ALWAYS)
+            {
+                mVBarVisible = (content->getHeight()
+                    > h - mScrollbarWidth);
+            }
+            break;
+        default:
+            break;
+    }
+}
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 7d2b39a96..70abac6ef 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -20,11 +20,55 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef GUI_WIDGETS_SCROLLAREA_H
 #define GUI_WIDGETS_SCROLLAREA_H
 
-#include "gui/base/widgets/scrollarea.hpp"
+#include "gui/widgets/basiccontainer.h"
 
+#include "listeners/mouselistener.h"
 #include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
@@ -41,11 +85,28 @@ class ImageCollection;
  *
  * \ingroup GUI
  */
-class ScrollArea final : public gcn::ScrollArea,
+class ScrollArea final : public BasicContainer,
+                         public MouseListener,
                          public WidgetListener
 {
     public:
         /**
+         * Scrollpolicies for the horizontal and vertical scrollbar.
+         * The policies are:
+         *
+         * SHOW_ALWAYS - Always show the scrollbars no matter what.
+         * SHOW_NEVER  - Never show the scrollbars no matter waht.
+         * SHOW_AUTO   - Show the scrollbars only when needed. That is if the
+         *               content grows larger then the ScrollArea.
+         */
+        enum ScrollPolicy
+        {
+            SHOW_ALWAYS = 0,
+            SHOW_NEVER,
+            SHOW_AUTO
+        };
+
+        /**
          * Constructor.
          *
          * @param content the initial content to show in the scroll area
@@ -135,6 +196,234 @@ class ScrollArea final : public gcn::ScrollArea,
 
         Rect getRightButtonDimension() const;
 
+        /**
+         * Sets the content.
+         *
+         * @param widget The content of the scroll area.
+         */
+        void setContent(Widget* widget);
+
+        /**
+         * Gets the content.
+         *
+         * @return The content of the scroll area.
+         */
+        Widget* getContent();
+
+        /**
+         * Sets the horizontal scrollbar policy. See enum with policies.
+         *
+         * @param hPolicy The policy for the horizontal scrollbar.
+         * @see getHorizontalScrollPolicy
+         */
+        void setHorizontalScrollPolicy(const ScrollPolicy hPolicy);
+
+        /**
+         * Gets the horizontal scrollbar policy. See enum with policies.
+         *
+         * @return The policy for the horizontal scrollbar policy.
+         * @see setHorizontalScrollPolicy, setScrollPolicy
+         */
+        ScrollPolicy getHorizontalScrollPolicy() const
+        { return mHPolicy; }
+
+        /**
+         * Sets the vertical scrollbar policy. See enum with policies.
+         *
+         * @param vPolicy The policy for the vertical scrollbar.
+         * @see getVerticalScrollPolicy
+         */
+        void setVerticalScrollPolicy(const ScrollPolicy vPolicy);
+
+        /**
+         * Gets the vertical scrollbar policy. See enum with policies.
+         *
+         * @return The policy for the vertical scrollbar.
+         * @see setVerticalScrollPolicy, setScrollPolicy
+         */
+        ScrollPolicy getVerticalScrollPolicy() const
+        { return mVPolicy; }
+
+        /**
+         * Sets the horizontal and vertical scrollbar policy.
+         *
+         * @param hPolicy The policy for the horizontal scrollbar.
+         * @param vPolicy The policy for the vertical scrollbar.
+         * @see getVerticalScrollPolicy, getHorizontalScrollPolicy
+         */
+        void setScrollPolicy(const ScrollPolicy hPolicy,
+                             const ScrollPolicy vPolicy);
+
+        /**
+         * Sets the amount to scroll vertically.
+         *
+         * @param vScroll The amount to scroll.
+         * @see getVerticalScrollAmount
+         */
+        void setVerticalScrollAmount(const int vScroll);
+
+        /**
+         * Gets the amount that is scrolled vertically.
+         *
+         * @return The scroll amount on vertical scroll.
+         * @see setVerticalScrollAmount, setScrollAmount
+         */
+        int getVerticalScrollAmount() const
+        { return mVScroll; }
+
+        /**
+         * Sets the amount to scroll horizontally.
+         *
+         * @param hScroll The amount to scroll.
+         * @see getHorizontalScrollAmount
+         */
+        void setHorizontalScrollAmount(int hScroll);
+
+        /**
+         * Gets the amount that is scrolled horizontally.
+         *
+         * @return The scroll amount on horizontal scroll.
+         * @see setHorizontalScrollAmount, setScrollAmount
+         */
+        int getHorizontalScrollAmount() const
+        { return mHScroll; }
+
+        /**
+         * Sets the amount to scroll horizontally and vertically.
+         *
+         * @param hScroll The amount to scroll on horizontal scroll.
+         * @param vScroll The amount to scroll on vertical scroll.
+         * @see getHorizontalScrollAmount, getVerticalScrollAmount
+         */
+        void setScrollAmount(const int hScroll, const int vScroll);
+
+        /**
+         * Gets the maximum amount of horizontal scroll.
+         *
+         * @return The horizontal max scroll.
+         */
+        int getHorizontalMaxScroll();
+
+        /**
+         * Gets the maximum amount of vertical scroll.
+         *
+         * @return The vertical max scroll.
+         */
+        int getVerticalMaxScroll();
+
+        /**
+         * Sets the width of the scroll bars.
+         *
+         * @param width The width of the scroll bars.
+         * @see getScrollbarWidth
+         */
+        void setScrollbarWidth(const int width);
+
+        /**
+         * Gets the width of the scroll bars.
+         *
+         * @return the width of the ScrollBar.
+         * @see setScrollbarWidth
+         */
+        int getScrollbarWidth() const
+        { return mScrollbarWidth; }
+
+        /**
+         * Sets the amount to scroll in pixels when the left scroll button is
+         * pushed.
+         *
+         * @param amount The amount to scroll in pixels. 
+         * @see getLeftButtonScrollAmount
+         */
+        void setLeftButtonScrollAmount(const int amount)
+        { mLeftButtonScrollAmount = amount; }
+
+        /**
+         * Sets the amount to scroll in pixels when the right scroll button is
+         * pushed.
+         *
+         * @param amount The amount to scroll in pixels.
+         * @see getRightButtonScrollAmount
+         */
+        void setRightButtonScrollAmount(const int amount)
+        { mRightButtonScrollAmount = amount; }
+
+        /**
+         * Sets the amount to scroll in pixels when the up scroll button is
+         * pushed.
+         *
+         * @param amount The amount to scroll in pixels.
+         * @see getUpButtonScrollAmount
+         */
+        void setUpButtonScrollAmount(const int amount)
+        { mUpButtonScrollAmount = amount; }
+
+        /**
+         * Sets the amount to scroll in pixels when the down scroll button is
+         * pushed.
+         *
+         * @param amount The amount to scroll in pixels.
+         * @see getDownButtonScrollAmount
+         */
+        void setDownButtonScrollAmount(const int amount)
+        { mDownButtonScrollAmount = amount; }
+
+        /**
+         * Gets the amount to scroll in pixels when the left scroll button is
+         * pushed.
+         *
+         * @return The amount to scroll in pixels.
+         * @see setLeftButtonScrollAmount
+         */
+        int getLeftButtonScrollAmount() const
+        { return mLeftButtonScrollAmount; }
+
+        /**
+         * Gets the amount to scroll in pixels when the right scroll button is
+         * pushed.
+         *
+         * @return The amount to scroll in pixels.
+         * @see setRightButtonScrollAmount
+         */
+        int getRightButtonScrollAmount() const
+        { return mRightButtonScrollAmount; }
+
+        /**
+         * Gets the amount to scroll in pixels when the up scroll button is
+         * pushed.
+         *
+         * @return The amount to scroll in pixels.
+         * @see setUpButtonScrollAmount
+         */
+        int getUpButtonScrollAmount() const
+        { return mUpButtonScrollAmount; }
+
+        /**
+         * Gets the amount to scroll in pixels when the down scroll button is
+         * pushed.
+         *
+         * @return The amount to scroll in pixels.
+         * @see setDownButtonScrollAmount
+         */
+        int getDownButtonScrollAmount() const
+        { return mDownButtonScrollAmount; }
+
+        void showWidgetPart(Widget *const widget, Rect area) override final;
+
+        Rect getChildrenArea() override final;
+
+        Widget *getWidgetAt(int x, int y) override final;
+
+        void setWidth(int width);
+
+        void setHeight(int height);
+
+        void setDimension(const Rect& dimension);
+
+        void mouseWheelMovedUp(MouseEvent& mouseEvent) override final;
+
+        void mouseWheelMovedDown(MouseEvent& mouseEvent) override final;
+
     protected:
         enum BUTTON_DIR
         {
@@ -150,12 +439,17 @@ class ScrollArea final : public gcn::ScrollArea,
          */
         void init(std::string skinName);
 
+        /**
+         * Checks the policies for the scroll bars.
+         */
+        void checkPolicies();
+
         void drawButton(Graphics *const graphics, const BUTTON_DIR dir);
         void calcButton(Graphics *const graphics, const BUTTON_DIR dir);
-        void drawVBar(Graphics *const graphics) override final;
-        void drawHBar(Graphics *const graphics) override final;
-        void drawVMarker(Graphics *const graphics) override final;
-        void drawHMarker(Graphics *const graphics) override final;
+        void drawVBar(Graphics *const graphics);
+        void drawHBar(Graphics *const graphics);
+        void drawVMarker(Graphics *const graphics);
+        void drawHMarker(Graphics *const graphics);
 
         void calcVBar(Graphics *const graphics);
         void calcHBar(Graphics *const graphics);
@@ -176,8 +470,111 @@ class ScrollArea final : public gcn::ScrollArea,
         static ImageRect hBackground;
         static Image *buttons[4][2];
 
-        int mX, mY;
-        int mClickX, mClickY;
+        /**
+         * Holds the vertical scroll amount.
+         */
+        int mVScroll;
+
+        /**
+         * Holds the horizontal scroll amount.
+         */
+        int mHScroll;
+
+        /**
+         * Holds the width of the scroll bars.
+         */
+        int mScrollbarWidth;
+
+        /**
+         * Holds the horizontal scroll bar policy.
+         */
+        ScrollPolicy mHPolicy;
+
+        /**
+         * Holds the vertical scroll bar policy.
+         */
+        ScrollPolicy mVPolicy;
+
+        /**
+         * True if the vertical scroll bar is visible, false otherwise.
+         */
+        bool mVBarVisible;
+
+        /**
+         * True if the horizontal scroll bar is visible, false otherwise.
+         */
+        bool mHBarVisible;
+
+        /**
+         * True if the up button is pressed, false otherwise.
+         */
+        bool mUpButtonPressed;
+
+        /**
+         * True if the down button is pressed, false otherwise.
+         */
+        bool mDownButtonPressed;
+
+        /**
+         * True if the left button is pressed, false otherwise.
+         */
+        bool mLeftButtonPressed;
+
+        /**
+         * True if the right button is pressed, false otherwise.
+         */
+        bool mRightButtonPressed;
+
+        /**
+         * Holds the up button scroll amount.
+         */
+        int mUpButtonScrollAmount;
+
+        /**
+         * Holds the down button scroll amount.
+         */
+        int mDownButtonScrollAmount;
+
+        /**
+         * Holds the left button scroll amount.
+         */
+        int mLeftButtonScrollAmount;
+
+        /**
+         * Holds the right button scroll amount.
+         */
+        int mRightButtonScrollAmount;
+
+        /**
+         * True if the vertical marked is dragged.
+         */
+        bool mIsVerticalMarkerDragged;
+
+        /**
+         * True if the horizontal marked is dragged.
+         */
+        bool mIsHorizontalMarkerDragged;
+
+        /**
+         * Holds the horizontal markers drag offset.
+         */
+        int mHorizontalMarkerDragOffset;
+
+        /**
+         * Holds the vertical markers drag offset.
+         */
+        int mVerticalMarkerDragOffset;
+
+        /**
+         * True if the scroll area should be opaque (that is
+         * display its background), false otherwise.
+         */
+        bool mOpaque;
+
+        int mX;
+        int mY;
+        int mClickX;
+        int mClickY;
         ImageCollection *mVertexes;
         ImageCollection *mVertexes2;
         int mXOffset;
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index fe979ae5a..8fe9d707b 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -72,8 +72,8 @@ ChatTab::ChatTab(const Widget2 *const widget,
         mTextOutput->setLinkHandler(chatWindow->mItemLinkHandler);
     mTextOutput->setAlwaysUpdate(false);
 
-    mScrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
-                                 gcn::ScrollArea::SHOW_ALWAYS);
+    mScrollArea->setScrollPolicy(ScrollArea::SHOW_NEVER,
+        ScrollArea::SHOW_ALWAYS);
     mScrollArea->setScrollAmount(0, 1);
 
     if (chatWindow)
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index ac6bf2837..940d0cd3f 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -84,15 +84,15 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     // TRANSLATORS: settings colors tab name
     setName(_("Colors"));
     mColorBox->addSelectionListener(this);
-    mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mPreview->setOpaque(false);
 
     // don't do anything with links
     mPreview->setLinkHandler(nullptr);
 
     mPreviewBox->setHeight(20);
-    mPreviewBox->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
-                                 gcn::ScrollArea::SHOW_NEVER);
+    mPreviewBox->setScrollPolicy(ScrollArea::SHOW_NEVER,
+        ScrollArea::SHOW_NEVER);
 
     mGradTypeSlider->setWidth(180);
     mGradTypeSlider->setActionEventId("slider_grad");
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 1458ecd25..ca060477f 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -221,7 +221,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
 
     mPlayerTitleTable->setLinewiseSelection(true);
 
-    mPlayerScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mPlayerScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mPlayerTable->setActionEventId(ACTION_TABLE);
     mPlayerTable->setLinewiseSelection(true);
     mPlayerTable->addActionListener(this);
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index f55dceaa4..d09704203 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -227,7 +227,7 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     ScrollArea *const scrollArea = new ScrollArea(this, mModeList,
         true, "setup_video_background.xml");
     scrollArea->setWidth(150);
-    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    scrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mOpenGLDropDown->setSelected(renderToIndex[mOpenGLEnabled]);
 
diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h
index 17f016c76..34f3647d5 100644
--- a/src/gui/widgets/widget.h
+++ b/src/gui/widgets/widget.h
@@ -959,7 +959,7 @@ class Widget : public Widget2
           * @param area The area to show.
           * @since 0.1.0
           */
-        virtual void showWidgetPart(Widget* widget A_UNUSED,
+        virtual void showWidgetPart(Widget *const widget A_UNUSED,
                                     Rect area A_UNUSED)
         { }
 
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index c2514a15d..7b1a1f6c0 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -209,7 +209,7 @@ void BuyDialog::init()
     mShopItemList->postInit();
     mScrollArea = new ScrollArea(this, mShopItemList,
         getOptionBool("showbackground"), "buy_background.xml");
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mSlider = new Slider(this, 1.0);
     mQuantityLabel = new Label(this, strprintf(
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index ee8c85f06..a12dca882 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -151,9 +151,9 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
 
     mItems->addSelectionListener(this);
 
-    gcn::ScrollArea *const invenScroll = new ScrollArea(this, mItems,
+    ScrollArea *const invenScroll = new ScrollArea(this, mItems,
         getOptionBool("showbackground"), "inventory_background.xml");
-    invenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    invenScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     const int size = config.getIntValue("fontSize");
     mFilter = new TabStrip(this, "filter_" + getWindowName(), size + 16);
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index a1b2109fb..1956a8da3 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -147,8 +147,8 @@ NpcDialog::NpcDialog(const int npcId) :
     mTextBox->setEnableKeys(true);
     mTextBox->setEnableTabs(true);
 
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mScrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+    mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+    mScrollArea->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
     // Setup listbox
     mItemList->setWrappingEnabled(true);
@@ -162,8 +162,8 @@ NpcDialog::NpcDialog(const int npcId) :
         mItemList->setRowHeight(gui->getNpcFont()->getHeight());
 
     setContentSize(260, 175);
-    mListScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mItemScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mListScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+    mItemScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mItemList->setVisible(true);
     mTextField->setVisible(true);
     mIntField->setVisible(true);
diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp
index 3c63775fe..48324cb40 100644
--- a/src/gui/windows/npcpostdialog.cpp
+++ b/src/gui/windows/npcpostdialog.cpp
@@ -75,7 +75,7 @@ void NpcPostDialog::postInit()
 
     // create scroll box for letter text
     ScrollArea *const scrollArea = new ScrollArea(this, mText);
-    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    scrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     scrollArea->setDimension(Rect(
                 5, mSender->getHeight() + 5,
                 380, 140 - (mSender->getHeight() + sendButton->getHeight())));
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index eee3e4259..e22bcf243 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -149,10 +149,10 @@ QuestsWindow::QuestsWindow() :
     mQuestsListBox->setActionEventId("select");
     mQuestsListBox->addActionListener(this);
 
-    mQuestScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mQuestScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mText->setOpaque(false);
     mText->setLinkHandler(mItemLinkHandler);
-    mTextScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mTextScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mQuestsListBox->setWidth(500);
     if (gui && gui->getNpcFont()->getHeight() < 20)
         mQuestsListBox->setRowHeight(20);
diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp
index 8bfcc6728..1607733a4 100644
--- a/src/gui/windows/selldialog.cpp
+++ b/src/gui/windows/selldialog.cpp
@@ -89,7 +89,7 @@ void SellDialog::init()
     mShopItemList->setProtectItems(true);
     mScrollArea = new ScrollArea(this, mShopItemList,
         getOptionBool("showbackground"), "sell_background.xml");
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mSlider = new Slider(this, 1.0);
 
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index af29da656..a7e384cbd 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -240,7 +240,7 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo,
 
     ScrollArea *const usedScroll = new ScrollArea(this, mServersList,
         getOptionBool("showbackground"), "server_background.xml");
-    usedScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    usedScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mServersList->addSelectionListener(this);
     usedScroll->setVerticalScrollAmount(0);
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 32e249d35..e21fa914c 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -138,8 +138,8 @@ ShopWindow::ShopWindow():
     mBuyShopItemList->setPriceCheck(false);
     mSellShopItemList->setPriceCheck(false);
 
-    mBuyScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mSellScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mBuyScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+    mSellScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mBuyShopItemList->addSelectionListener(this);
     mSellShopItemList->addSelectionListener(this);
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 5b3c03e90..6ec442cd5 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -97,7 +97,7 @@ ShortcutWindow::ShortcutWindow(const std::string &restrict title,
     mBoxesWidth += bw + border;
 
     mScrollArea->setPosition(SCROLL_PADDING, SCROLL_PADDING);
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     place(0, 0, mScrollArea, 5, 5).setPadding(0);
 
@@ -163,7 +163,7 @@ void ShortcutWindow::addTab(const std::string &name,
 {
     ScrollArea *const scroll = new ScrollArea(this, content, false);
     scroll->setPosition(SCROLL_PADDING, SCROLL_PADDING);
-    scroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    scroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     content->setWidget2(this);
     Tab *const tab = new ShortcutTab(this, name, content);
     mTabs->addTab(tab, scroll);
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index f33534a85..607be4f3b 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -198,8 +198,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
     }
 
     A_DELETE_COPY(SocialGuildTab)
@@ -334,8 +334,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
     }
 
     A_DELETE_COPY(SocialGuildTab2)
@@ -403,8 +403,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
     }
 
     A_DELETE_COPY(SocialPartyTab)
@@ -519,8 +519,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         getPlayersAvatars();
         setCaption(name);
@@ -685,8 +685,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         // TRANSLATORS: Navigation tab name in social window. Should be small
         setCaption(_("Nav"));
@@ -1014,8 +1014,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         // TRANSLATORS: Attack filter tab name in social window. Should be small
         setCaption(_("Atk"));
@@ -1061,8 +1061,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         // TRANSLATORS: Pickup filter tab name in social window. Should be small
         setCaption(_("Pik"));
@@ -1108,8 +1108,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         getPlayersAvatars();
         setCaption(name);
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index 77d167c82..58c1aaee8 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -60,7 +60,7 @@ WorldSelectDialog::WorldSelectDialog(Worlds worlds):
     ScrollArea *const worldsScroll = new ScrollArea(this, mWorldList,
         getOptionBool("showbackground"), "world_background.xml");
 
-    worldsScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    worldsScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     place(0, 0, worldsScroll, 3, 5).setPadding(2);
     place(1, 5, mChangeLoginButton);