Merge checkbox classes in one.

4 files changed, 175 insertions, 337 deletions

diff --git a/src/gui/base/widgets/checkbox.cpp b/src/gui/base/widgets/checkbox.cpp
deleted file mode 100644
index 476fb3c6b..000000000
--- a/src/gui/base/widgets/checkbox.cpp
+++ /dev/null
@@ -1,151 +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/checkbox.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
-
-    CheckBox::CheckBox(const Widget2 *const widget) :
-        Widget(widget),
-        MouseListener(),
-        KeyListener(),
-        mSelected(false),
-        mCaption()
-    {
-        setFocusable(true);
-        addMouseListener(this);
-        addKeyListener(this);
-    }
-
-    CheckBox::CheckBox(const Widget2 *const widget,
-                       const std::string &caption,
-                       bool selected) :
-        Widget(widget),
-        MouseListener(),
-        KeyListener(),
-        mSelected(selected),
-        mCaption()
-    {
-        setCaption(caption);
-
-        setFocusable(true);
-        addMouseListener(this);
-        addKeyListener(this);
-
-        adjustSize();
-    }
-
-    bool CheckBox::isSelected() const
-    {
-        return mSelected;
-    }
-
-    void CheckBox::setSelected(bool selected)
-    {
-        mSelected = selected;
-    }
-
-    const std::string &CheckBox::getCaption() const
-    {
-        return mCaption;
-    }
-
-    void CheckBox::setCaption(const std::string& caption)
-    {
-        mCaption = caption;
-    }
-
-    void CheckBox::keyPressed(KeyEvent& keyEvent A_UNUSED)
-    {
-    }
-
-    void CheckBox::mouseClicked(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.getButton() == MouseEvent::LEFT)
-        {
-            toggleSelected();
-        }
-    }
-
-    void CheckBox::mouseDragged(MouseEvent& mouseEvent)
-    {
-        mouseEvent.consume();
-    }
-
-    void CheckBox::adjustSize()
-    {
-    }
-
-    void CheckBox::toggleSelected()
-    {
-        mSelected = !mSelected;
-        distributeActionEvent();
-    }
-}  // namespace gcn
diff --git a/src/gui/base/widgets/checkbox.hpp b/src/gui/base/widgets/checkbox.hpp
deleted file mode 100644
index 6fcb04767..000000000
--- a/src/gui/base/widgets/checkbox.hpp
+++ /dev/null
@@ -1,183 +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_CHECKBOX_HPP
-#define GCN_CHECKBOX_HPP
-
-#include <string>
-
-#include "listeners/keylistener.h"
-#include "listeners/mouselistener.h"
-
-#include "gui/widgets/widget.h"
-
-namespace gcn
-{
-    /**
-     * An implementation of a check box where a user can select or deselect
-     * the check box and where the status of the check box is displayed to the user.
-     * A check box is capable of displaying a caption. 
-     * 
-     * If a check box's state changes an action event will be sent to all action 
-     * listeners of the check box.
-     */
-    class CheckBox :
-        public Widget,
-        public MouseListener,
-        public KeyListener
-    {
-    public:
-        /**
-         * Contructor.
-         */
-        explicit CheckBox(const Widget2 *const widget);
-
-        /**
-         * Constructor. The check box will be automatically resized
-         * to fit the caption.
-         *
-         * @param caption The caption of the check box.
-         * @param marked True if the check box is selected, false otherwise.
-         */
-        CheckBox(const Widget2 *const widget,
-                 const std::string &caption,
-                 bool selected = false);
-
-        A_DELETE_COPY(CheckBox)
-
-        /**
-         * Destructor.
-         */
-        virtual ~CheckBox()
-        { }
-
-        /**
-         * Checks if the check box is selected.
-         *
-         * @return True if the check box is selected, false otherwise.
-         * @see setSelected
-         */
-        bool isSelected() const;
-
-        /**
-         * Sets the check box to be selected or not.
-         *
-         * @param selected True if the check box should be set as selected.
-         * @see isSelected
-         */
-        void setSelected(bool selected);
-
-        /**
-         * Gets the caption of the check box.
-         *
-         * @return The caption of the check box.
-         * @see setCaption
-         */
-        const std::string &getCaption() const;
-
-        /**
-         * Sets the caption of the check box. It's advisable to call
-         * adjustSize after setting of the caption to adjust the
-         * check box's size to fit the caption.
-         *
-         * @param caption The caption of the check box.
-         * @see getCaption, adjustSize
-         */
-        void setCaption(const std::string& caption);
-
-        /**
-         * Adjusts the check box's size to fit the caption.
-         */
-        void adjustSize();
-
-        // Inherited from KeyListener
-
-        virtual void keyPressed(KeyEvent& keyEvent) override;
-
-        // Inherited from MouseListener
-
-        virtual void mouseClicked(MouseEvent& mouseEvent) override;
-
-        virtual void mouseDragged(MouseEvent& mouseEvent) override;
-
-
-    protected:
-        /**
-         * Toggles the check box between being selected and
-         * not being selected.
-         */
-        virtual void toggleSelected();
-
-        /**
-         * True if the check box is selected, false otherwise.
-         */
-        bool mSelected;
-
-        /**
-         * Holds the caption of the check box.
-         */
-        std::string mCaption;
-    };
-}  // namespace gcn
-
-#endif  // end GCN_CHECKBOX_HPP
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 9fb63b2e8..c905ae0c4 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.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/checkbox.h"
 
 #include "client.h"
@@ -44,7 +87,11 @@ CheckBox::CheckBox(const Widget2 *const widget,
                    const bool selected,
                    ActionListener *const listener,
                    const std::string &restrict eventId) :
-    gcn::CheckBox(widget, caption, selected),
+    Widget(widget),
+    MouseListener(),
+    KeyListener(),
+    mSelected(selected),
+    mCaption(),
     mPadding(0),
     mImagePadding(0),
     mImageSize(9),
@@ -52,6 +99,12 @@ CheckBox::CheckBox(const Widget2 *const widget,
     mHasMouse(false),
     mDrawBox(true)
 {
+    setCaption(caption);
+
+    setFocusable(true);
+    addMouseListener(this);
+    addKeyListener(this);
+
     mForegroundColor2 = getThemeColor(Theme::CHECKBOX_OUTLINE);
     if (instances == 0)
     {
@@ -200,3 +253,20 @@ void CheckBox::adjustSize()
     setWidth(mImagePadding + mImageSize + mSpacing
         + getFont()->getWidth(mCaption) + mPadding);
 }
+
+void CheckBox::mouseClicked(MouseEvent& mouseEvent)
+{
+    if (mouseEvent.getButton() == MouseEvent::LEFT)
+        toggleSelected();
+}
+
+void CheckBox::mouseDragged(MouseEvent& mouseEvent)
+{
+    mouseEvent.consume();
+}
+
+void CheckBox::toggleSelected()
+{
+    mSelected = !mSelected;
+    distributeActionEvent();
+}
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 28eadb75c..5711e766f 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -20,10 +20,56 @@
  *  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_CHECKBOX_H
 #define GUI_WIDGETS_CHECKBOX_H
 
-#include "gui/base/widgets/checkbox.hpp"
+#include "listeners/keylistener.h"
+#include "listeners/mouselistener.h"
+
+#include "gui/widgets/widget.h"
 
 #include "localconsts.h"
 
@@ -34,7 +80,9 @@ class Skin;
  *
  * \ingroup GUI
  */
-class CheckBox final : public gcn::CheckBox
+class CheckBox final : public Widget,
+                       public MouseListener,
+                       public KeyListener
 {
     public:
         /**
@@ -82,7 +130,61 @@ class CheckBox final : public gcn::CheckBox
 
         void adjustSize();
 
+        /**
+         * Checks if the check box is selected.
+         *
+         * @return True if the check box is selected, false otherwise.
+         * @see setSelected
+         */
+        bool isSelected() const
+        { return mSelected; }
+
+        /**
+         * Sets the check box to be selected or not.
+         *
+         * @param selected True if the check box should be set as selected.
+         * @see isSelected
+         */
+        void setSelected(const bool selected)
+        { mSelected = selected; }
+
+        /**
+         * Gets the caption of the check box.
+         *
+         * @return The caption of the check box.
+         * @see setCaption
+         */
+        const std::string &getCaption() const
+        { return mCaption; }
+
+        /**
+         * Sets the caption of the check box. It's advisable to call
+         * adjustSize after setting of the caption to adjust the
+         * check box's size to fit the caption.
+         *
+         * @param caption The caption of the check box.
+         * @see getCaption, adjustSize
+         */
+        void setCaption(const std::string& caption)
+        { mCaption = caption; }
+
+        void mouseClicked(MouseEvent& mouseEvent) override final;
+
+        void mouseDragged(MouseEvent& mouseEvent) override final;
+
     private:
+        void toggleSelected();
+
+        /**
+         * True if the check box is selected, false otherwise.
+         */
+        bool mSelected;
+
+        /**
+         * Holds the caption of the check box.
+         */
+        std::string mCaption;
+
         int mPadding;
         int mImagePadding;
         int mImageSize;