From 706a61dad756355ad4c0645a18f281398e9f5583 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Fri, 20 Sep 2024 09:15:46 +0200
Subject: [PATCH 01/19] Fix typo of Color constructor

---
 src/color.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/color.cpp b/src/color.cpp
index cb39bf8..3c294cc 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -66,7 +66,7 @@ namespace gcn
     Color::Color(int color) :
         r((color >> 16) & 0xFF),
         g((color >> 8) & 0xFF),
-        b((color >> 8) & 0xFF)
+        b((color >> 0) & 0xFF)
     {}
 
     Color::Color(int r, int g, int b, int a) : r(r), g(g), b(b), a(a)

From 7f214e2ac09aeaf82bdc06fb36ca7a591b49c08c Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Sat, 21 Sep 2024 22:50:47 +0200
Subject: [PATCH 02/19] Add inputbox in Widget example Fix message display of
 `InputBox` Remove some duplicated virtual methods of `InputBox`.

---
 examples/widgets_example.hpp        |  32 ++++-
 include/guisan/widgets/inputbox.hpp |  14 +-
 src/widget.cpp                      |  12 +-
 src/widgets/inputbox.cpp            | 206 +++++-----------------------
 4 files changed, 76 insertions(+), 188 deletions(-)

diff --git a/examples/widgets_example.hpp b/examples/widgets_example.hpp
index 674b1a1..3ecbb33 100644
--- a/examples/widgets_example.hpp
+++ b/examples/widgets_example.hpp
@@ -28,7 +28,7 @@ namespace WidgetsExample
         }
     };
 
-    class MainContainer
+    class MainContainer : public gcn::ActionListener
     {
     public:
         MainContainer(gcn::Gui& gui, int width, int height)
@@ -54,6 +54,15 @@ namespace WidgetsExample
 
             button = std::make_unique<gcn::Button>("Button");
 
+            button->addActionListener(this);
+
+            inputBox = std::make_unique<gcn::InputBox>("Change name", " Set name of label ");
+
+            inputBox->setVisible(false);
+            inputBox->setMovable(true);
+            inputBox->setFrameSize(1);
+            inputBox->addActionListener(this);
+
             textField = std::make_unique<gcn::TextField>("Text field");
 
             textBox = std::make_unique<gcn::TextBox>("Lorem ipsum dolor sit amet consectetur\n"
@@ -116,6 +125,7 @@ namespace WidgetsExample
             top->add(button.get(), 325, 10);
             top->add(textField.get(), 375, 10);
             top->add(textBoxScrollArea.get(), 290, 50);
+            top->add(inputBox.get(), 270, 180);
             top->add(listBox.get(), 290, 200);
             top->add(dropDown.get(), 580, 10);
             top->add(checkBox1.get(), 580, 50);
@@ -132,6 +142,25 @@ namespace WidgetsExample
 
         ~MainContainer() = default;
 
+        // Implement the action function in ActionListener to receive actions
+        // The eventId tells us which widget called the action function.
+        void action(const gcn::ActionEvent& actionEvent) override {
+            if (actionEvent.getSource() == button.get())
+            {
+                inputBox->setVisible(true);
+                top->moveToTop(inputBox.get());
+            }
+            else if (actionEvent.getSource() == inputBox.get())
+            {
+                inputBox->setVisible(false);
+                if (inputBox->getClickedButton() == 0)
+                {
+                    label->setCaption(inputBox->getText());
+                    label->adjustSize();
+                }
+            }
+        }
+
     private:
         std::unique_ptr<gcn::ImageFont> font; // A font
 
@@ -143,6 +172,7 @@ namespace WidgetsExample
         std::unique_ptr<gcn::Label> label; // A label
         std::unique_ptr<gcn::Icon> icon; // An icon (image)
         std::unique_ptr<gcn::Button> button; // A button
+        std::unique_ptr<gcn::InputBox> inputBox; // An input box
         std::unique_ptr<gcn::TextField> textField; // One-line text field
         std::unique_ptr<gcn::TextBox> textBox; // Multi-line text box
         std::unique_ptr<gcn::ScrollArea> textBoxScrollArea; // Scroll area for the text box
diff --git a/include/guisan/widgets/inputbox.hpp b/include/guisan/widgets/inputbox.hpp
index 99332b8..50e5e06 100644
--- a/include/guisan/widgets/inputbox.hpp
+++ b/include/guisan/widgets/inputbox.hpp
@@ -85,7 +85,10 @@ namespace gcn
          * @param ok the string corresponding to the "OK" button
          * @param cancel the string corresponding to the "Cancel" button
          */
-        InputBox(const std::string& caption, const std::string& message, const std::string &ok = "OK", const std::string &cancel = "Cancel");
+        InputBox(const std::string& caption,
+                 const std::string& message,
+                 const std::string& ok = "OK",
+                 const std::string& cancel = "Cancel");
 
         /**
          * Destructor.
@@ -103,7 +106,7 @@ namespace gcn
         /**
          * Get the text that was input by the user
          * Use in conjunction with getClickedButton() to tell an empty string from a cancel operation.
-         * 
+         *
          * @return the text which was typed by the user
          */
         std::string getText() const;
@@ -114,18 +117,11 @@ namespace gcn
          */
         int getClickedButton() const;
 
-        // Inherited from Widget
-
-        void draw(Graphics* graphics) override;
-
         // Inherited from MouseListener
 
-        void mousePressed(MouseEvent& mouseEvent) override;
-        void mouseDragged(MouseEvent& mouseEvent) override;
         void mouseReleased(MouseEvent& mouseEvent) override;
 
     protected:
-        std::string mMessage;
         int mClickedButton = -1;
 
         Button *mButtonOK = nullptr;
diff --git a/src/widget.cpp b/src/widget.cpp
index 81c4bb8..5d89d85 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -1049,15 +1049,15 @@ namespace gcn
         graphics->pushClipArea(mDimension);
         draw(graphics);
 
-        const Rectangle& childrenArea = getChildrenArea();
+        Rectangle childrenArea = getChildrenArea();
         graphics->pushClipArea(childrenArea);
+        childrenArea.x = 0;
+        childrenArea.y = 0;
 
-        std::list<Widget*>::const_iterator iter;
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        for (auto* widget : mChildren)
         {
-            Widget* widget = (*iter);
-            // Only draw a widget if it's visible and if it visible
-            // inside the children area.
+            // Only draw a widget if it's visible
+            // and if it visible inside the children area.
             if (widget->isVisible() && childrenArea.isIntersecting(widget->getDimension()))
             {
                 widget->_draw(graphics);
diff --git a/src/widgets/inputbox.cpp b/src/widgets/inputbox.cpp
index 13a651d..117c399 100644
--- a/src/widgets/inputbox.cpp
+++ b/src/widgets/inputbox.cpp
@@ -72,8 +72,7 @@ namespace gcn
                        const std::string& message,
                        const std::string& ok,
                        const std::string& cancel) :
-        Window(caption),
-        mMessage(message)
+        Window(caption)
     {
         addMouseListener(this);
         setMovable(false);
@@ -93,9 +92,9 @@ namespace gcn
         mButtonCancel->setAlignment(Graphics::Center);
         mButtonCancel->addMouseListener(this);
         mButtonCancel->adjustSize();
-        
+
         // Look-and-feel: make both buttons the same width
-        if(mButtonCancel->getWidth() > mButtonOK->getWidth())
+        if (mButtonCancel->getWidth() > mButtonOK->getWidth())
         {
             mButtonOK->setWidth(mButtonCancel->getWidth());
         }
@@ -103,26 +102,30 @@ namespace gcn
         {
             mButtonCancel->setWidth(mButtonOK->getWidth());
         }
-        
-        setHeight((int)getTitleBarHeight() + mLabel->getHeight() + mText->getHeight() + 6 * mPadding + mButtonOK->getHeight() + 2 * getFrameSize());
+
+        setHeight((int) getTitleBarHeight() + mLabel->getHeight() + mText->getHeight()
+                  + 6 * mPadding + mButtonOK->getHeight() + 2 * getFrameSize());
         setWidth(mLabel->getWidth() + 2 * mPadding + 2 * getFrameSize());
-        if(2 * mButtonOK->getWidth() + 4 * mPadding + 2 * getFrameSize() > getWidth()) 
+        if (2 * mButtonOK->getWidth() + 4 * mPadding + 2 * getFrameSize() > getWidth())
         {
-            setWidth(2 * mButtonOK->getWidth() + 4*mPadding + 2 * getFrameSize());
+            setWidth(2 * mButtonOK->getWidth() + 4 * mPadding + 2 * getFrameSize());
         }
         mText->setWidth(getWidth() - 2 * getFrameSize() - 5 * mPadding);
-        
-        this->add(mLabel, (getWidth() - mLabel->getWidth())/2 - mPadding, mPadding);
-        this->add(mText, 2*mPadding, 2 * mPadding + mLabel->getHeight());
-        int yButtons = getHeight() - (int)getTitleBarHeight() - getFrameSize() - 2*mPadding - mButtonOK->getHeight();
-        this->add(mButtonOK, (getWidth() - 2 * mButtonOK->getWidth())/4, yButtons);
-        this->add(mButtonCancel, getWidth() - 2*getFrameSize() - mButtonOK->getWidth() - mPadding, yButtons);
-        
+
+        this->add(mLabel, (getWidth() - mLabel->getWidth()) / 2 - mPadding, mPadding);
+        this->add(mText, 2 * mPadding, 2 * mPadding + mLabel->getHeight());
+        int yButtons = getHeight() - (int) getTitleBarHeight() - getFrameSize() - 2 * mPadding
+                     - mButtonOK->getHeight();
+        this->add(mButtonOK, (getWidth() - 2 * mButtonOK->getWidth()) / 4, yButtons);
+        this->add(mButtonCancel,
+                  getWidth() - 2 * getFrameSize() - mButtonOK->getWidth() - mPadding,
+                  yButtons);
+
         try
         {
             requestModalFocus();
-        } 
-        catch (Exception e) 
+        }
+        catch (Exception e)
         {
             // Not having modal focus is not critical
         }
@@ -131,184 +134,43 @@ namespace gcn
     InputBox::~InputBox()
     {
         releaseModalFocus();
-        
+
         delete mLabel;
         delete mButtonOK;
         delete mButtonCancel;
         delete mText;
     }
 
-    void InputBox::draw(Graphics* graphics)
-    {
-        Color faceColor = getBaseColor();
-        Color highlightColor, shadowColor;
-        int alpha = getBaseColor().a;
-        //int width = getWidth() + getFrameSize() * 2 - 1;
-        //int height = getHeight() + getFrameSize() * 2 - 1;
-        highlightColor = faceColor + 0x303030;
-        highlightColor.a = alpha;
-        shadowColor = faceColor - 0x303030;
-        shadowColor.a = alpha;
-
-        Rectangle d = getChildrenArea();
-
-        // Fill the background around the content
-        graphics->setColor(faceColor);
-        // Fill top
-        graphics->fillRectangle(Rectangle(0,0,getWidth(),d.y - 1));
-        // Fill left
-        graphics->fillRectangle(Rectangle(0,d.y - 1, d.x - 1, getHeight() - d.y + 1));
-        // Fill right
-        graphics->fillRectangle(Rectangle(d.x + d.width + 1,
-                                          d.y - 1,
-                                          getWidth() - d.x - d.width - 1,
-                                          getHeight() - d.y + 1));
-        // Fill bottom
-        graphics->fillRectangle(Rectangle(d.x - 1,
-                                          d.y + d.height + 1,
-                                          d.width + 2,
-                                          getHeight() - d.height - d.y - 1));
-
-        if (isOpaque())
-        {
-            graphics->fillRectangle(d);
-        }
-
-        // Construct a rectangle one pixel bigger than the content
-        d.x -= 1;
-        d.y -= 1;
-        d.width += 2;
-        d.height += 2;
-
-        // Draw a border around the content
-        graphics->setColor(shadowColor);
-        // Top line
-        graphics->drawLine(d.x,
-                           d.y,
-                           d.x + d.width - 2,
-                           d.y);
-
-        // Left line
-        graphics->drawLine(d.x,
-                           d.y + 1,
-                           d.x,
-                           d.y + d.height - 1);
-
-        graphics->setColor(highlightColor);
-        // Right line
-        graphics->drawLine(d.x + d.width - 1,
-                           d.y,
-                           d.x + d.width - 1,
-                           d.y + d.height - 2);
-        // Bottom line
-        graphics->drawLine(d.x + 1,
-                           d.y + d.height - 1,
-                           d.x + d.width - 1,
-                           d.y + d.height - 1);
-
-        //drawChildren(graphics);
-
-        int textX;
-        int textY;
-
-        textY = ((int)getTitleBarHeight() - getFont()->getHeight()) / 2;
-
-        switch (getAlignment())
-        {
-          case Graphics::Left:
-              textX = 4;
-              break;
-          case Graphics::Center:
-              textX = getWidth() / 2;
-              break;
-          case Graphics::Right:
-              textX = getWidth() - 4;
-              break;
-          default:
-              throw GCN_EXCEPTION("Unknown alignment.");
-        }
-
-        if (isEnabled())
-            graphics->setColor(getForegroundColor());
-        else
-            graphics->setColor(Color(128, 128, 128));
-        graphics->setFont(getFont());
-        graphics->pushClipArea(Rectangle(0, 0, getWidth(), getTitleBarHeight() - 1));
-        graphics->drawText(getCaption(), textX, textY, getAlignment(), isEnabled());
-        graphics->popClipArea();
-    }
-
-    void InputBox::mousePressed(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.getSource() != this)
-        {
-            return;
-        }
-        
-        if (getParent() != NULL)
-        {
-            getParent()->moveToTop(this);
-        }
-
-        mDragOffsetX = mouseEvent.getX();
-        mDragOffsetY = mouseEvent.getY();
-
-        mMoved = mouseEvent.getY() <= (int)mTitleBarHeight;
-    }
-
     void InputBox::mouseReleased(MouseEvent& mouseEvent)
     {
-        if (mouseEvent.getSource() != this)
-        {           
-            if(mouseEvent.getSource() == mButtonOK)
-            {
-                mClickedButton = 0;
-                distributeActionEvent();
-            }
-            if(mouseEvent.getSource() == mButtonCancel)
-            {
-                mClickedButton = 1;
-                setVisible(false);
-                distributeActionEvent();
-            }
-         
-        }
-        else
+        if (mouseEvent.getSource() == mButtonOK)
         {
-            mMoved = false;
+            mClickedButton = 0;
+            distributeActionEvent();
         }
-    }
-
-    void InputBox::mouseDragged(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.isConsumed() || mouseEvent.getSource() != this)
+        else if (mouseEvent.getSource() == mButtonCancel)
         {
-            return;
+            mClickedButton = 1;
+            setVisible(false);
+            distributeActionEvent();
         }
-        
-        if (isMovable() && mMoved)
-        {
-            setPosition(mouseEvent.getX() - mDragOffsetX + getX(),
-                        mouseEvent.getY() - mDragOffsetY + getY());
-        }
-
-        mouseEvent.consume();
+        Window::mouseReleased(mouseEvent);
     }
-    
+
     int InputBox::getClickedButton() const
     {
         return mClickedButton;
     }
-    
+
     std::string InputBox::getText() const
     {
         return mText->getText();
     }
-    
+
     void InputBox::addToContainer(Container* container)
     {
         int x = container->getWidth() - getWidth();
         int y = container->getHeight() - getHeight();
-        container->add(this, x/2, y/2);
+        container->add(this, x / 2, y / 2);
     }
-}
+} // namespace gcn

From 220c871e9201d94e978d4d493f8ec16242ac3079 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Sat, 21 Sep 2024 22:57:21 +0200
Subject: [PATCH 03/19] [cleanup] Use `std::unique_ptr` in `InputBox`

---
 include/guisan/widgets/inputbox.hpp |  9 +++++----
 src/widgets/inputbox.cpp            | 25 ++++++++++---------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/include/guisan/widgets/inputbox.hpp b/include/guisan/widgets/inputbox.hpp
index 50e5e06..0fb7c32 100644
--- a/include/guisan/widgets/inputbox.hpp
+++ b/include/guisan/widgets/inputbox.hpp
@@ -57,6 +57,7 @@
 #ifndef GCN_INPUTBOX_HPP
 #define GCN_INPUTBOX_HPP
 
+#include <memory>
 #include <string>
 
 #include "guisan/mouselistener.hpp"
@@ -124,10 +125,10 @@ namespace gcn
     protected:
         int mClickedButton = -1;
 
-        Button *mButtonOK = nullptr;
-        Button *mButtonCancel = nullptr;
-        Label *mLabel = nullptr;
-        TextField *mText = nullptr;
+        std::unique_ptr<Button> mButtonOK;
+        std::unique_ptr<Button> mButtonCancel;
+        std::unique_ptr<Label> mLabel;
+        std::unique_ptr<TextField> mText;
     };
 }
 
diff --git a/src/widgets/inputbox.cpp b/src/widgets/inputbox.cpp
index 117c399..9470a8e 100644
--- a/src/widgets/inputbox.cpp
+++ b/src/widgets/inputbox.cpp
@@ -77,18 +77,18 @@ namespace gcn
         addMouseListener(this);
         setMovable(false);
 
-        mLabel = new Label(message);
+        mLabel = std::make_unique<Label>(message);
         mLabel->setAlignment(Graphics::Left);
         mLabel->adjustSize();
 
-        mText = new TextField();
+        mText = std::make_unique<TextField>();
 
-        mButtonOK = new Button(ok);
+        mButtonOK = std::make_unique<Button>(ok);
         mButtonOK->setAlignment(Graphics::Center);
         mButtonOK->addMouseListener(this);
         mButtonOK->adjustSize();
 
-        mButtonCancel = new Button(cancel);
+        mButtonCancel = std::make_unique<Button>(cancel);
         mButtonCancel->setAlignment(Graphics::Center);
         mButtonCancel->addMouseListener(this);
         mButtonCancel->adjustSize();
@@ -112,12 +112,12 @@ namespace gcn
         }
         mText->setWidth(getWidth() - 2 * getFrameSize() - 5 * mPadding);
 
-        this->add(mLabel, (getWidth() - mLabel->getWidth()) / 2 - mPadding, mPadding);
-        this->add(mText, 2 * mPadding, 2 * mPadding + mLabel->getHeight());
+        this->add(mLabel.get(), (getWidth() - mLabel->getWidth()) / 2 - mPadding, mPadding);
+        this->add(mText.get(), 2 * mPadding, 2 * mPadding + mLabel->getHeight());
         int yButtons = getHeight() - (int) getTitleBarHeight() - getFrameSize() - 2 * mPadding
                      - mButtonOK->getHeight();
-        this->add(mButtonOK, (getWidth() - 2 * mButtonOK->getWidth()) / 4, yButtons);
-        this->add(mButtonCancel,
+        this->add(mButtonOK.get(), (getWidth() - 2 * mButtonOK->getWidth()) / 4, yButtons);
+        this->add(mButtonCancel.get(),
                   getWidth() - 2 * getFrameSize() - mButtonOK->getWidth() - mPadding,
                   yButtons);
 
@@ -134,21 +134,16 @@ namespace gcn
     InputBox::~InputBox()
     {
         releaseModalFocus();
-
-        delete mLabel;
-        delete mButtonOK;
-        delete mButtonCancel;
-        delete mText;
     }
 
     void InputBox::mouseReleased(MouseEvent& mouseEvent)
     {
-        if (mouseEvent.getSource() == mButtonOK)
+        if (mouseEvent.getSource() == mButtonOK.get())
         {
             mClickedButton = 0;
             distributeActionEvent();
         }
-        else if (mouseEvent.getSource() == mButtonCancel)
+        else if (mouseEvent.getSource() == mButtonCancel.get())
         {
             mClickedButton = 1;
             setVisible(false);

From 593d8c3c77d9cdb46fbd0e99f8457cb962aae231 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Sun, 22 Sep 2024 08:47:26 +0200
Subject: [PATCH 04/19] [example] Add messageBox in widgets example

---
 examples/widgets_example.hpp | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/examples/widgets_example.hpp b/examples/widgets_example.hpp
index 3ecbb33..1113376 100644
--- a/examples/widgets_example.hpp
+++ b/examples/widgets_example.hpp
@@ -101,6 +101,15 @@ namespace WidgetsExample
             progress->setCaption("Loading");
             progress->setWidth(100);
 
+            std::vector<std::string> button_names{"0", "25", "50", "75", "100", "-1", "+1"};
+            messageBox = std::make_unique<gcn::MessageBox>("Change progression",
+                                                           "Set progression value",
+                                                           button_names.data(),
+                                                           button_names.size());
+            messageBox->setMovable(true);
+            messageBox->setFrameSize(1);
+            messageBox->addActionListener(this);
+
             guisanLogoImage.reset(gcn::Image::load("guisan-logo.png"));
             guisanLogoIcon = std::make_unique<gcn::Icon>(guisanLogoImage.get());
             window->add(guisanLogoIcon.get());
@@ -138,6 +147,7 @@ namespace WidgetsExample
             top->add(nestedScrollArea.get(), 440, 350);
 
             top->add(progress.get(), 580, 200);
+            top->add(messageBox.get(), 480, 220);
         }
 
         ~MainContainer() = default;
@@ -159,6 +169,20 @@ namespace WidgetsExample
                     label->adjustSize();
                 }
             }
+            else if (actionEvent.getSource() == messageBox.get())
+            {
+                switch (messageBox->getClickedButton())
+                {
+                    default:
+                    case 0: progress->setValue(0); break;
+                    case 1: progress->setValue(25); break;
+                    case 2: progress->setValue(50); break;
+                    case 3: progress->setValue(75); break;
+                    case 4: progress->setValue(100); break;
+                    case 5: progress->setValue(progress->getValue() - 1); break;
+                    case 6: progress->setValue(progress->getValue() + 1); break;
+                }
+            }
         }
 
     private:
@@ -186,6 +210,7 @@ namespace WidgetsExample
         std::unique_ptr<gcn::Slider> slider; // A slider
         std::unique_ptr<gcn::Image> image; // An image for the icon
         std::unique_ptr<gcn::Window> window;
+        std::unique_ptr<gcn::MessageBox> messageBox;
         std::unique_ptr<gcn::ProgressBar> progress;
         std::unique_ptr<gcn::Image> guisanLogoImage;
         std::unique_ptr<gcn::Icon> guisanLogoIcon;

From 402ccdfaa568858765ca19a5e57bb1a0a34b6b3c Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Sun, 22 Sep 2024 09:49:20 +0200
Subject: [PATCH 05/19] [cleanup] - Remove some duplicated (virtual) methods of
 `MessageBox`. - Use `std::unique_ptr`/`std::vector` - clang-format

---
 examples/widgets_example.hpp          |   3 +-
 include/guisan/widgets/messagebox.hpp | 126 +++------
 src/widgets/messagebox.cpp            | 357 ++++++--------------------
 3 files changed, 106 insertions(+), 380 deletions(-)

diff --git a/examples/widgets_example.hpp b/examples/widgets_example.hpp
index 1113376..1dd4bb8 100644
--- a/examples/widgets_example.hpp
+++ b/examples/widgets_example.hpp
@@ -104,8 +104,7 @@ namespace WidgetsExample
             std::vector<std::string> button_names{"0", "25", "50", "75", "100", "-1", "+1"};
             messageBox = std::make_unique<gcn::MessageBox>("Change progression",
                                                            "Set progression value",
-                                                           button_names.data(),
-                                                           button_names.size());
+                                                           button_names);
             messageBox->setMovable(true);
             messageBox->setFrameSize(1);
             messageBox->addActionListener(this);
diff --git a/include/guisan/widgets/messagebox.hpp b/include/guisan/widgets/messagebox.hpp
index 0271a0c..26cff60 100644
--- a/include/guisan/widgets/messagebox.hpp
+++ b/include/guisan/widgets/messagebox.hpp
@@ -57,15 +57,14 @@
 #ifndef GCN_MESSAGEBOX_HPP
 #define GCN_MESSAGEBOX_HPP
 
-#include <string>
-
-#include "guisan/graphics.hpp"
-#include "guisan/mouselistener.hpp"
 #include "guisan/platform.hpp"
-#include "guisan/widgets/window.hpp"
 #include "guisan/widgets/button.hpp"
 #include "guisan/widgets/label.hpp"
-#include "guisan/widgets/icon.hpp"
+#include "guisan/widgets/window.hpp"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace gcn
 {
@@ -75,25 +74,38 @@ namespace gcn
     class GCN_CORE_DECLSPEC MessageBox : public Window
     {
     public:
-
         /**
          * Constructor.
-         * This version only has a single button labeled "OK". 
+         * This version only has a single button labeled "OK".
          *
          * @param caption the MessageBox caption.
          * @param message the message to display in the MessageBox
          */
         MessageBox(const std::string& caption, const std::string& message);
-        
+
         /**
          * Constructor.
          *
          * @param caption the MessageBox caption.
          * @param message the message to display in the MessageBox
-         * @param buttons strings to display as button captions
+         * @param button_captions strings to display as button captions
          * @param size length of the buttons array
          */
-        MessageBox(const std::string& caption, const std::string& message, const std::string *buttons, int size);
+        MessageBox(const std::string& caption,
+                   const std::string& message,
+                   const std::string* button_captions,
+                   int size);
+
+        /**
+         * Constructor.
+         *
+         * @param caption the MessageBox caption.
+         * @param message the message to display in the MessageBox
+         * @param button_captions strings to display as button captions
+         */
+        MessageBox(const std::string& caption,
+                   const std::string& message,
+                   const std::vector<std::string>& button_captions);
 
         /**
          * Destructor.
@@ -107,20 +119,6 @@ namespace gcn
          */
         int getClickedButton() const;
 
-        /**
-         * Sets the MessageBox caption.
-         *
-         * @param caption the MessageBox caption.
-         */
-        void setCaption(const std::string& caption);
-
-        /**
-         * Gets the MessageBox caption.
-         *
-         * @return the MessageBox caption.
-         */
-        const std::string& getCaption() const;
-
         /**
          * Sets the position for the button(s) in the MessageBox.
          *
@@ -136,91 +134,25 @@ namespace gcn
         Graphics::Alignment getButtonAlignment() const;
 
         /**
-         * Sets the padding of the window which is the distance between the
-         * window border and the content.
-         *
-         * @param padding the padding value.
-         */
-        void setPadding(unsigned int padding);
-
-        /**
-         * Gets the padding.
-         *
-         * @return the padding value.
-         */
-        unsigned int getPadding() const;
-
-        /**
-         * Sets the title bar height.
-         *
-         * @param height the title height value.
-         */
-        void setTitleBarHeight(unsigned int height);
-
-        /**
-         * Gets the title bar height.
-         *
-         * @return the title bar height.
-         */
-        unsigned int getTitleBarHeight();
-
-        /**
-         * Check if the window is movable.
-         *
-         * @return true or false.
-         */
-        bool isMovable() const;
-
-        /**
-         * Sets the MessageBox to be opaque. If it's not opaque, the content area
-         * will not be filled with a color.
-         *
-         * @param opaque true or false.
-         */
-        void setOpaque(bool opaque);
-
-        /**
-         * Checks if the MessageBox is opaque.
-         *
-         * @return true or false.
-         */
-        bool isOpaque();
-        
-        /**
-         * Add this MessageBox to a parent container, centered both horizontally and vertically
-         * If instead, you want to place it somewhere else, use Container::add(). 
+         * Add this MessageBox to a parent container,
+         * centered both horizontally and vertically.
+         * If instead, you want to place it somewhere else, use Container::add().
          *
          * @param container parent container
          */
         void addToContainer(Container* container);
 
-        // Inherit from Window
-
-        /**
-         * Resizes the container to fit the content exactly.
-         */
-        void resizeToContent() override;
-
-        // Inherited from Widget
-
-        Rectangle getChildrenArea() override;
-        void draw(Graphics* graphics) override;
-
         // Inherited from MouseListener
 
-        void mousePressed(MouseEvent& mouseEvent) override;
-        void mouseDragged(MouseEvent& mouseEvent) override;
         void mouseReleased(MouseEvent& mouseEvent) override;
 
     protected:
-        std::string mMessage;
-        int mNbButtons;
         Graphics::Alignment mButtonAlignment = Graphics::Alignment::Left;
         int mClickedButton = -1;
 
-        Button **mButtons = nullptr;
-        Label *mLabel = nullptr;
+        std::vector<std::unique_ptr<Button>> mButtons;
+        std::unique_ptr<Label> mLabel;
     };
-}
+} // namespace gcn
 
 #endif // end GCN_MESSAGEBOX_HPP
diff --git a/src/widgets/messagebox.cpp b/src/widgets/messagebox.cpp
index ec29773..0c147d0 100644
--- a/src/widgets/messagebox.cpp
+++ b/src/widgets/messagebox.cpp
@@ -71,69 +71,72 @@ namespace gcn
 {
 
     MessageBox::MessageBox(const std::string& caption, const std::string& message) :
-        MessageBox(caption, message, std::vector<std::string>{"OK"}.data(), 1)
-    {
-    }
+        MessageBox(caption, message, {"OK"})
+    {}
 
     MessageBox::MessageBox(const std::string& caption,
                            const std::string& message,
-                           const std::string* buttons,
+                           const std::vector<std::string>& button_captions) :
+        MessageBox(caption, message, button_captions.data(), button_captions.size())
+    {}
+
+    MessageBox::MessageBox(const std::string& caption,
+                           const std::string& message,
+                           const std::string* button_captions,
                            int size) :
-        Window(caption),
-        mMessage(message)
+        Window(caption)
     {
         addMouseListener(this);
         setMovable(false);
 
-        mLabel = new Label(message);
+        mLabel = std::make_unique<Label>(message);
         mLabel->setAlignment(Graphics::Left);
         mLabel->adjustSize();
-        setWidth(mLabel->getWidth() + 4*mPadding);
+        setWidth(mLabel->getWidth() + 4 * mPadding);
 
-        //Create buttons and label
-        if(size > 0) 
+        //Create buttons
+        int maxButtonWidth = 0;
+        int maxButtonHeight = 0;
+        for (int i = 0; i < size; i++)
         {
-            mNbButtons = size;
-            mButtons = new Button*[size];
-            int maxBtnWidth = 0;
-            
-            for(int i = 0 ; i < size ; i++)
-            {
-                mButtons[i] = new Button(*(buttons+i));
-                mButtons[i]->setAlignment(Graphics::Center);
-                mButtons[i]->addMouseListener(this);
-                maxBtnWidth = maxBtnWidth > mButtons[i]->getWidth() ? maxBtnWidth : mButtons[i]->getWidth();
-            }
-            //Find the widest button, apply same width to all
-            for(int i = 0 ; i < size ; i++)
-            {
-                mButtons[i]->setWidth(maxBtnWidth);
-            }
-            
-            //Make sure everything fits into the window
-            int padding = mPadding;
-            if(mButtons[0]->getWidth()*size + 4*mPadding + mPadding*(size-1) > getWidth()) 
-            {
-                setWidth(mButtons[0]->getWidth()*size + 4*mPadding + mPadding*(size-1));
-            } 
-            else 
-            {
-                padding += (getWidth() - (mButtons[0]->getWidth()*size + 4*mPadding + mPadding*(size-1)))/2;
-            }
-            add(mLabel, (getWidth() - mLabel->getWidth())/2 - mPadding, mPadding);
-            
-            setHeight((int)getTitleBarHeight() + mLabel->getHeight() + 4*mPadding + mButtons[0]->getHeight());
-            for(int i = 0 ; i < size ; i++)
-            {
-                add(mButtons[i], padding + (maxBtnWidth + mPadding)*i, getHeight() - (int)getTitleBarHeight() - mPadding - mButtons[0]->getHeight());
-            }
+            mButtons.emplace_back(std::make_unique<Button>(button_captions[i]));
+            auto& button = mButtons.back();
+            button->setAlignment(Graphics::Center);
+            button->addMouseListener(this);
+            maxButtonWidth = std::max(maxButtonWidth, button->getWidth());
+            maxButtonHeight = std::max(maxButtonHeight, button->getHeight());
         }
-        
+        // Find the widest button, apply same width to all
+        for (auto& button : mButtons)
+        {
+            button->setWidth(maxButtonWidth);
+        }
+        //Make sure everything fits into the window
+        int padding = mPadding;
+        if (maxButtonWidth * size + 4 * mPadding + mPadding * (size - 1) > getWidth())
+        {
+            setWidth(maxButtonWidth * size + 4 * mPadding + mPadding * (size - 1));
+        }
+        else
+        {
+            padding +=
+                (getWidth() - (maxButtonWidth * size + 4 * mPadding + mPadding * (size - 1))) / 2;
+        }
+        setHeight((int) getTitleBarHeight() + mLabel->getHeight() + 4 * mPadding + maxButtonHeight);
+        add(mLabel.get(), (getWidth() - mLabel->getWidth()) / 2 - mPadding, mPadding);
+
+        for (std::size_t i = 0; i < mButtons.size(); ++i)
+        {
+            add(mButtons[i].get(),
+                padding + (maxButtonWidth + mPadding) * i,
+                getHeight() - (int) getTitleBarHeight() - mPadding - mButtons[0]->getHeight());
+        }
+
         try
         {
             requestModalFocus();
-        } 
-        catch (Exception e) 
+        }
+        catch (Exception e)
         {
             // Not having modal focus is not critical
         }
@@ -142,69 +145,36 @@ namespace gcn
     MessageBox::~MessageBox()
     {
         releaseModalFocus();
-        
-        delete mLabel;
-        for(int i = 0 ; i < mNbButtons ; i++)
-        {
-            delete mButtons[i];
-        }
-        delete mButtons;
-    }
-
-    void MessageBox::setPadding(unsigned int padding)
-    {
-        mPadding = padding;
-    }
-
-    unsigned int MessageBox::getPadding() const
-    {
-        return mPadding;
-    }
-
-    void MessageBox::setTitleBarHeight(unsigned int height)
-    {
-        mTitleBarHeight = height;
-    }
-
-    unsigned int MessageBox::getTitleBarHeight()
-    {
-        return mTitleBarHeight;
-    }
-
-    void MessageBox::setCaption(const std::string& caption)
-    {
-        mCaption = caption;
-    }
-
-    const std::string& MessageBox::getCaption() const
-    {
-        return mCaption;
     }
 
     void MessageBox::setButtonAlignment(Graphics::Alignment alignment)
     {
         mButtonAlignment = alignment;
-        
+
         int leftPadding = mPadding;
-        if(mNbButtons > 0)
+        if (!mButtons.empty())
         {
             switch (alignment)
             {
-              case Graphics::Left:
-                  // Nothing to do
-                  break;
-              case Graphics::Center:
-                  leftPadding += (getWidth() - (mButtons[0]->getWidth()*mNbButtons + 2*mPadding + mPadding*(mNbButtons-1)))/2;
-                  break;
-              case Graphics::Right:
-                  leftPadding += (getWidth() - (mButtons[0]->getWidth()*mNbButtons + 2*mPadding + mPadding*(mNbButtons-1)));
-                  break;
-              default:
-                  throw GCN_EXCEPTION("Unknown alignment.");
+                case Graphics::Left:
+                    // Nothing to do
+                    break;
+                case Graphics::Center:
+                    leftPadding += (getWidth()
+                                    - (mButtons[0]->getWidth() * mButtons.size() + 2 * mPadding
+                                       + mPadding * (mButtons.size() - 1)))
+                                 / 2;
+                    break;
+                case Graphics::Right:
+                    leftPadding += (getWidth()
+                                    - (mButtons[0]->getWidth() * mButtons.size() + 2 * mPadding
+                                       + mPadding * (mButtons.size() - 1)));
+                    break;
+                default: throw GCN_EXCEPTION("Unknown alignment.");
             }
-            for(int i = 0 ; i < mNbButtons ; i++)
+            for (std::size_t i = 0; i != mButtons.size(); ++i)
             {
-                mButtons[i]->setX(leftPadding + (mButtons[0]->getWidth() + mPadding)*i);
+                mButtons[i]->setX(leftPadding + (mButtons[0]->getWidth() + mPadding) * i);
             }
         }
     }
@@ -214,130 +184,15 @@ namespace gcn
         return mButtonAlignment;
     }
 
-    void MessageBox::draw(Graphics* graphics)
-    {
-        Color faceColor = getBaseColor();
-        Color highlightColor, shadowColor;
-        int alpha = getBaseColor().a;
-        //int width = getWidth() + getFrameSize() * 2 - 1;
-        //int height = getHeight() + getFrameSize() * 2 - 1;
-        highlightColor = faceColor + 0x303030;
-        highlightColor.a = alpha;
-        shadowColor = faceColor - 0x303030;
-        shadowColor.a = alpha;
-
-        Rectangle d = getChildrenArea();
-
-        // Fill the background around the content
-        graphics->setColor(faceColor);
-        // Fill top
-        graphics->fillRectangle(Rectangle(0,0,getWidth(),d.y - 1));
-        // Fill left
-        graphics->fillRectangle(Rectangle(0,d.y - 1, d.x - 1, getHeight() - d.y + 1));
-        // Fill right
-        graphics->fillRectangle(Rectangle(d.x + d.width + 1,
-                                          d.y - 1,
-                                          getWidth() - d.x - d.width - 1,
-                                          getHeight() - d.y + 1));
-        // Fill bottom
-        graphics->fillRectangle(Rectangle(d.x - 1,
-                                          d.y + d.height + 1,
-                                          d.width + 2,
-                                          getHeight() - d.height - d.y - 1));
-
-        if (isOpaque())
-        {
-            graphics->fillRectangle(d);
-        }
-
-        // Construct a rectangle one pixel bigger than the content
-        d.x -= 1;
-        d.y -= 1;
-        d.width += 2;
-        d.height += 2;
-
-        // Draw a border around the content
-        graphics->setColor(shadowColor);
-        // Top line
-        graphics->drawLine(d.x,
-                           d.y,
-                           d.x + d.width - 2,
-                           d.y);
-
-        // Left line
-        graphics->drawLine(d.x,
-                           d.y + 1,
-                           d.x,
-                           d.y + d.height - 1);
-
-        graphics->setColor(highlightColor);
-        // Right line
-        graphics->drawLine(d.x + d.width - 1,
-                           d.y,
-                           d.x + d.width - 1,
-                           d.y + d.height - 2);
-        // Bottom line
-        graphics->drawLine(d.x + 1,
-                           d.y + d.height - 1,
-                           d.x + d.width - 1,
-                           d.y + d.height - 1);
-
-        //drawChildren(graphics);
-
-        int textX;
-        int textY;
-
-        textY = ((int)getTitleBarHeight() - getFont()->getHeight()) / 2;
-
-        switch (getAlignment())
-        {
-          case Graphics::Left:
-              textX = 4;
-              break;
-          case Graphics::Center:
-              textX = getWidth() / 2;
-              break;
-          case Graphics::Right:
-              textX = getWidth() - 4;
-              break;
-          default:
-              throw GCN_EXCEPTION("Unknown alignment.");
-        }
-
-        graphics->setColor(getForegroundColor());
-        graphics->setFont(getFont());
-        graphics->pushClipArea(Rectangle(0, 0, getWidth(), getTitleBarHeight() - 1));
-        graphics->drawText(getCaption(), textX, textY, getAlignment(), isEnabled());
-        graphics->popClipArea();
-    }
-
-    void MessageBox::mousePressed(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.getSource() != this)
-        {
-            return;
-        }
-        
-        if (getParent() != NULL)
-        {
-            getParent()->moveToTop(this);
-        }
-
-        mDragOffsetX = mouseEvent.getX();
-        mDragOffsetY = mouseEvent.getY();
-
-        mMoved = mouseEvent.getY() <= (int)mTitleBarHeight;
-    }
-
     void MessageBox::mouseReleased(MouseEvent& mouseEvent)
     {
         if (mouseEvent.getSource() != this)
         {
-            for(int i = 0 ; i < mNbButtons ; i++)
+            for (std::size_t i = 0; i != mButtons.size(); ++i)
             {
-                if(mouseEvent.getSource() == mButtons[i])
+                if (mouseEvent.getSource() == mButtons[i].get())
                 {
-                    mClickedButton = i;
+                    mClickedButton = static_cast<int>(i);
                     distributeActionEvent();
                     break;
                 }
@@ -345,79 +200,19 @@ namespace gcn
         }
         else
         {
-            mMoved = false;
+            Window::mouseReleased(mouseEvent);
         }
     }
 
-    void MessageBox::mouseDragged(MouseEvent& mouseEvent)
-    {
-        if (mouseEvent.isConsumed() || mouseEvent.getSource() != this)
-        {
-            return;
-        }
-        
-        if (isMovable() && mMoved)
-        {
-            setPosition(mouseEvent.getX() - mDragOffsetX + getX(),
-                        mouseEvent.getY() - mDragOffsetY + getY());
-        }
-
-        mouseEvent.consume();
-    }
-
-    Rectangle MessageBox::getChildrenArea()
-    {
-        return Rectangle(getPadding(),
-                         getTitleBarHeight(),
-                         getWidth() - getPadding() * 2,
-                         getHeight() - getPadding() - getTitleBarHeight());
-    }
-
-    bool MessageBox::isMovable() const
-    {
-        return mMovable;
-    }
-
-    void MessageBox::setOpaque(bool opaque)
-    {
-        mOpaque = opaque;
-    }
-
-    bool MessageBox::isOpaque()
-    {
-        return mOpaque;
-    }
-
-    void MessageBox::resizeToContent()
-    {
-        std::list<Widget*>::const_iterator it;
-
-        int w = 0, h = 0;
-        for (it = mChildren.begin(); it != mChildren.end(); it++)
-        {
-            if ((*it)->getX() + (*it)->getWidth() > w)
-            {
-                w = (*it)->getX() + (*it)->getWidth();
-            }
-
-            if ((*it)->getY() + (*it)->getHeight() > h)
-            {
-                h = (*it)->getY() + (*it)->getHeight();
-            }
-        }
-
-        setSize(w + 2* getPadding(), h + getPadding() + getTitleBarHeight());
-    }
-    
     int MessageBox::getClickedButton() const
     {
         return mClickedButton;
     }
-    
+
     void MessageBox::addToContainer(Container* container)
     {
         int x = container->getWidth() - getWidth();
         int y = container->getHeight() - getHeight();
-        container->add(this, x/2, y/2);
+        container->add(this, x / 2, y / 2);
     }
-}
+} // namespace gcn

From 28867898832e5bc223d4cc27495d7364ad6d9f71 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Mon, 23 Sep 2024 23:57:49 +0200
Subject: [PATCH 06/19] Fix compilation of opengl_widgets on windows.

---
 examples/opengl_helper.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/opengl_helper.hpp b/examples/opengl_helper.hpp
index de1e419..7055b4b 100644
--- a/examples/opengl_helper.hpp
+++ b/examples/opengl_helper.hpp
@@ -11,10 +11,10 @@
 
 #if defined(_WIN32)
 # include <windows.h>
-// Sometimes windows.h defines DELETE which causes a compilation
-// error in a Guichan header.
-# if defined(DELETE)
-#  undef DELETE
+// <windows.h> #defines MessageBox (as MessageBoxA or MessageBoxW)
+// which causes a compilation error in a Guichan header.
+# if defined(MessageBox)
+#  undef MessageBox
 # endif
 #endif
 

From fdd1e6f2afd17af07c12c86e52305883b6131237 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Mon, 23 Sep 2024 23:46:01 +0200
Subject: [PATCH 07/19] [cleanup] Replace `NULL` by `nullptr`

---
 demo/ff/src/ffdemo.cpp                        |  2 +-
 demo/ff/src/fflistbox.cpp                     |  2 +-
 include/guisan/focushandler.hpp               | 14 +--
 include/guisan/gui.hpp                        |  6 +-
 .../guisan/opengl/openglsdlimageloader.hpp    |  4 +-
 include/guisan/platform.hpp                   |  4 -
 include/guisan/sdl/sdlimage.hpp               |  2 +-
 include/guisan/widget.hpp                     | 20 ++--
 include/guisan/widgets/container.hpp          |  2 +-
 include/guisan/widgets/dropdown.hpp           |  6 +-
 src/focushandler.cpp                          | 44 ++++-----
 src/graphics.cpp                              |  2 +-
 src/gui.cpp                                   | 92 +++++++++----------
 src/image.cpp                                 |  4 +-
 src/imagefont.cpp                             |  4 +-
 src/opengl/openglgraphics.cpp                 |  2 +-
 src/opengl/openglimage.cpp                    | 12 +--
 src/sdl/sdl2graphics.cpp                      |  8 +-
 src/sdl/sdlgraphics.cpp                       |  2 +-
 src/sdl/sdlimage.cpp                          | 14 +--
 src/sdl/sdlimageloader.cpp                    |  8 +-
 src/widget.cpp                                | 62 ++++++-------
 src/widgets/dropdown.cpp                      |  8 +-
 src/widgets/icon.cpp                          |  2 +-
 src/widgets/listbox.cpp                       |  6 +-
 src/widgets/scrollarea.cpp                    | 14 +--
 src/widgets/tab.cpp                           |  6 +-
 src/widgets/tabbedarea.cpp                    | 12 +--
 src/widgets/textbox.cpp                       |  4 +-
 src/widgets/window.cpp                        |  2 +-
 30 files changed, 183 insertions(+), 187 deletions(-)

diff --git a/demo/ff/src/ffdemo.cpp b/demo/ff/src/ffdemo.cpp
index 6d9627e..2552ce9 100644
--- a/demo/ff/src/ffdemo.cpp
+++ b/demo/ff/src/ffdemo.cpp
@@ -700,7 +700,7 @@ void FFDemo::input()
             {
                 Mix_PlayChannel(-1, mEscapeSound, 0);
 
-                action(gcn::ActionEvent(NULL, "escape"));
+                action(gcn::ActionEvent(nullptr, "escape"));
             }
             else if (mEvent.key.keysym.sym == SDLK_RETURN
                      || mEvent.key.keysym.sym == SDLK_UP
diff --git a/demo/ff/src/fflistbox.cpp b/demo/ff/src/fflistbox.cpp
index 00131bb..7ed49e7 100644
--- a/demo/ff/src/fflistbox.cpp
+++ b/demo/ff/src/fflistbox.cpp
@@ -83,7 +83,7 @@ FFListBox::~FFListBox()
 
 void FFListBox::draw(gcn::Graphics* graphics)
 {
-		if (mListModel == NULL)
+		if (mListModel == nullptr)
 		{
         return;
 		}
diff --git a/include/guisan/focushandler.hpp b/include/guisan/focushandler.hpp
index 982834f..77cf1a9 100644
--- a/include/guisan/focushandler.hpp
+++ b/include/guisan/focushandler.hpp
@@ -164,14 +164,14 @@ namespace gcn
         /**
          * Gets the widget with focus.
          *
-         * @return The widget with focus. NULL if no widget has focus.
+         * @return The widget with focus. nullptr if no widget has focus.
          */
         virtual Widget* getFocused() const;
 
         /**
          * Gets the widget with modal focus.
          *
-         * @return The widget with modal focus. NULL if no widget has
+         * @return The widget with modal focus. nullptr if no widget has
          *         modal focus.
          */
         virtual Widget* getModalFocused() const;
@@ -179,7 +179,7 @@ namespace gcn
         /**
          * Gets the widget with modal mouse input focus.
          *
-         * @return The widget with modal mouse input focus. NULL if
+         * @return The widget with modal mouse input focus. nullptr if
          *         no widget has modal mouse input focus.
          */
         virtual Widget* getModalMouseInputFocused() const;
@@ -356,24 +356,24 @@ namespace gcn
         WidgetVector mWidgets;
 
         /**
-         * Holds the focused widget. NULL if no widget has focus.
+         * Holds the focused widget. nullptr if no widget has focus.
          */
         Widget* mFocusedWidget = nullptr;
 
         /**
-         * Holds the modal focused widget. NULL if no widget has
+         * Holds the modal focused widget. nullptr if no widget has
          * modal focused.
          */
         Widget* mModalFocusedWidget = nullptr;
 
         /**
-         * Holds the modal mouse input focused widget. NULL if no widget 
+         * Holds the modal mouse input focused widget. nullptr if no widget 
          * is being dragged.
          */
         Widget* mModalMouseInputFocusedWidget = nullptr;
 
         /** 
-         * Holds the dragged widget. NULL if no widget is
+         * Holds the dragged widget. nullptr if no widget is
          * being dragged.
          */
         Widget* mDraggedWidget = nullptr;
diff --git a/include/guisan/gui.hpp b/include/guisan/gui.hpp
index a536e52..3c46b85 100644
--- a/include/guisan/gui.hpp
+++ b/include/guisan/gui.hpp
@@ -136,7 +136,7 @@ namespace gcn
          * Gets the top widget. The top widget is the root widget
          * of the GUI.
          *
-         * @return The top widget. NULL if no top widget has been set.
+         * @return The top widget. nullptr if no top widget has been set.
          * @since 0.1.0
          */
         virtual Widget* getTop() const;
@@ -153,7 +153,7 @@ namespace gcn
         /**
          * Gets the graphics object used for drawing.
          *
-         *  @return The graphics object used for drawing. NULL if no
+         *  @return The graphics object used for drawing. nullptr if no
          *          graphics object has been set.
          * @see setGraphics, OpenGLGraphics, SDLGraphics
          * @since 0.1.0
@@ -172,7 +172,7 @@ namespace gcn
         /**
          * Gets the input object being used for input handling.
          *
-         *  @return The input object used for handling input. NULL if no
+         *  @return The input object used for handling input. nullptr if no
          *          input object has been set.
          * @see setInput, SDLInput
          * @since 0.1.0
diff --git a/include/guisan/opengl/openglsdlimageloader.hpp b/include/guisan/opengl/openglsdlimageloader.hpp
index ec4f3d9..20f662a 100644
--- a/include/guisan/opengl/openglsdlimageloader.hpp
+++ b/include/guisan/opengl/openglsdlimageloader.hpp
@@ -79,7 +79,7 @@ namespace gcn
         {
             SDL_Surface *loadedSurface = loadSDLSurface(filename);
 
-            if (loadedSurface == NULL)
+            if (loadedSurface == nullptr)
             {
                 throw GCN_EXCEPTION(
                         std::string("Unable to load image file: ") + filename);
@@ -88,7 +88,7 @@ namespace gcn
             SDL_Surface *surface = convertToStandardFormat(loadedSurface);
             SDL_FreeSurface(loadedSurface);
 
-            if (surface == NULL)
+            if (surface == nullptr)
             {
                 throw GCN_EXCEPTION(
                         std::string("Not enough memory to load: ") + filename);
diff --git a/include/guisan/platform.hpp b/include/guisan/platform.hpp
index 55643aa..2192b97 100644
--- a/include/guisan/platform.hpp
+++ b/include/guisan/platform.hpp
@@ -85,8 +85,4 @@
 #define GCN_EXTENSION_DECLSPEC
 #endif
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 #endif // end GCN_PLATFORM_HPP
diff --git a/include/guisan/sdl/sdlimage.hpp b/include/guisan/sdl/sdlimage.hpp
index 2ecfcff..afc0bcb 100644
--- a/include/guisan/sdl/sdlimage.hpp
+++ b/include/guisan/sdl/sdlimage.hpp
@@ -83,7 +83,7 @@ namespace gcn
          * @param autoFree true if the surface should automatically be deleted.
          * @param renderer renderer object to create the texture (last parameter to avoid breaking stuff)
          */
-        SDLImage(SDL_Surface* surface, bool autoFree, SDL_Renderer* renderer = NULL);
+        SDLImage(SDL_Surface* surface, bool autoFree, SDL_Renderer* renderer = nullptr);
 
         /**
          * Destructor.
diff --git a/include/guisan/widget.hpp b/include/guisan/widget.hpp
index e8e6495..dd3fce1 100644
--- a/include/guisan/widget.hpp
+++ b/include/guisan/widget.hpp
@@ -189,7 +189,7 @@ namespace gcn
         /**
          * Gets the widget's parent container.
          *
-         * @return The widget's parent container. NULL if the widget
+         * @return The widget's parent container. nullptr if the widget
          *         has no parent.
          * @since 0.1.0
          */
@@ -199,7 +199,7 @@ namespace gcn
          * Gets the top widget, or top parent, of this widget.
          *
          * @return The top widget, or top parent, for this widget.
-         *         NULL if no top widget exists
+         *         nullptr if no top widget exists
          *         (that is this widget doesn't have a parent).
          * @since 1.1.0
          */
@@ -722,7 +722,7 @@ namespace gcn
         static void setGlobalFont(Font* font);
 
         /**
-         * Sets the font for the widget. If NULL is passed, the global font 
+         * Sets the font for the widget. If nullptr is passed, the global font 
          * will be used.
          *
          * @param font The font to set for the widget.
@@ -861,12 +861,12 @@ namespace gcn
          * This function is used to decide which gets mouse input,
          * thus it can be overloaded to change that behaviour.
          *
-         * NOTE: This always returns NULL if the widget is not
+         * NOTE: This always returns nullptr if the widget is not
          *       a container.
          *
          * @param x The x coordinate of the widget to get.
          * @param y The y coordinate of the widget to get.
-         * @return The widget at the specified coodinate, NULL
+         * @return The widget at the specified coodinate, nullptr
          *         if no widget is found.
          * @since 0.6.0
          */
@@ -883,7 +883,7 @@ namespace gcn
          * @return A list of widgets. An empty list if no widgets was found.
          * @since 1.1.0
          */
-        virtual std::list<Widget*> getWidgetsIn(const Rectangle& area, Widget* ignore = NULL);
+        virtual std::list<Widget*> getWidgetsIn(const Rectangle& area, Widget* ignore = nullptr);
 
         /**
          * Gets the mouse listeners of the widget.
@@ -937,7 +937,7 @@ namespace gcn
          * Gets the internal focus handler used.
          *
          * @return the internalFocusHandler used. If no internal focus handler
-         *         is used, NULL will be returned.
+         *         is used, nullptr will be returned.
          * @see setInternalFocusHandler
          * @since 0.1.0
          */
@@ -1119,7 +1119,7 @@ namespace gcn
          *
          * @param id The id to find a widget by.
          * @return The widget with the corrosponding id, 
-         *         NULL of no widget is found.
+         *         nullptr of no widget is found.
          *
          * @since 1.1.0
          */
@@ -1196,13 +1196,13 @@ namespace gcn
         FocusHandler* mFocusHandler = nullptr;
 
         /**
-         * Holds the focus handler used by the widget. NULL
+         * Holds the focus handler used by the widget. nullptr
          * if no internal focus handler is used.
          */
         FocusHandler* mInternalFocusHandler = nullptr;
 
         /**
-         * Holds the parent of the widget. NULL if the widget
+         * Holds the parent of the widget. nullptr if the widget
          * has no parent.
          */
         Widget* mParent = nullptr;
diff --git a/include/guisan/widgets/container.hpp b/include/guisan/widgets/container.hpp
index 6b42ca0..a366849 100644
--- a/include/guisan/widgets/container.hpp
+++ b/include/guisan/widgets/container.hpp
@@ -154,7 +154,7 @@ namespace gcn
          * Finds a widget given an id.
          *
          * @param id The id to find a widget by.
-         * @return A widget with a corrosponding id, NULL if no widget 
+         * @return A widget with a corrosponding id, nullptr if no widget 
          *         is found.
          * @see Widget::setId
          */
diff --git a/include/guisan/widgets/dropdown.hpp b/include/guisan/widgets/dropdown.hpp
index a781a36..add22e3 100644
--- a/include/guisan/widgets/dropdown.hpp
+++ b/include/guisan/widgets/dropdown.hpp
@@ -105,9 +105,9 @@ namespace gcn
          * @param listBox the listBox to use.
          * @see ListModel, ScrollArea, ListBox.
          */
-        DropDown(ListModel *listModel = NULL,
-                 ScrollArea *scrollArea = NULL,
-                 ListBox *listBox = NULL);
+        DropDown(ListModel *listModel = nullptr,
+                 ScrollArea *scrollArea = nullptr,
+                 ListBox *listBox = nullptr);
 
         /**
          * Destructor.
diff --git a/src/focushandler.cpp b/src/focushandler.cpp
index 40acbc8..f0adafb 100644
--- a/src/focushandler.cpp
+++ b/src/focushandler.cpp
@@ -69,7 +69,7 @@ namespace gcn
 
     void FocusHandler::requestFocus(Widget* widget)
     {
-        if (widget == NULL
+        if (widget == nullptr
             || widget == mFocusedWidget)
         {
             return;
@@ -96,7 +96,7 @@ namespace gcn
         {
             mFocusedWidget = mWidgets.at(toBeFocusedIndex);
 
-            if (oldFocused != NULL)
+            if (oldFocused != nullptr)
             {
                 Event focusEvent(oldFocused);
                 distributeFocusLostEvent(focusEvent);
@@ -108,14 +108,14 @@ namespace gcn
 
     void FocusHandler::requestModalFocus(Widget* widget)
     {
-        if (mModalFocusedWidget != NULL && mModalFocusedWidget != widget)
+        if (mModalFocusedWidget != nullptr && mModalFocusedWidget != widget)
         {
             throw GCN_EXCEPTION("Another widget already has modal focus.");
         }
 
         mModalFocusedWidget = widget;
 
-        if (mFocusedWidget != NULL && !mFocusedWidget->isModalFocused())
+        if (mFocusedWidget != nullptr && !mFocusedWidget->isModalFocused())
         {
             focusNone();
         }
@@ -123,7 +123,7 @@ namespace gcn
 
     void FocusHandler::requestModalMouseInputFocus(Widget* widget)
     {
-        if (mModalMouseInputFocusedWidget != NULL
+        if (mModalMouseInputFocusedWidget != nullptr
             && mModalMouseInputFocusedWidget != widget)
         {
             throw GCN_EXCEPTION("Another widget already has modal input focus.");
@@ -136,7 +136,7 @@ namespace gcn
     {
         if (mModalFocusedWidget == widget)
         {
-            mModalFocusedWidget = NULL;
+            mModalFocusedWidget = nullptr;
         }
     }
 
@@ -144,7 +144,7 @@ namespace gcn
     {
         if (mModalMouseInputFocusedWidget == widget)
         {
-            mModalMouseInputFocusedWidget = NULL;
+            mModalMouseInputFocusedWidget = nullptr;
         }
     }
 
@@ -222,7 +222,7 @@ namespace gcn
     {
         if (mWidgets.size() == 0)
         {
-            mFocusedWidget = NULL;
+            mFocusedWidget = nullptr;
             return;
         }
 
@@ -292,7 +292,7 @@ namespace gcn
     {
         if (isFocused(widget))
         {
-            mFocusedWidget = NULL;
+            mFocusedWidget = nullptr;
         }
 
         WidgetIterator iter;
@@ -308,41 +308,41 @@ namespace gcn
 
         if (mDraggedWidget == widget)
         {
-            mDraggedWidget = NULL;
+            mDraggedWidget = nullptr;
             return;
         }
 
         if (mLastWidgetWithMouse == widget)
         {
-            mLastWidgetWithMouse = NULL;
+            mLastWidgetWithMouse = nullptr;
             return;
         }
 
         if (mLastWidgetWithModalFocus == widget)
         {
-            mLastWidgetWithModalFocus = NULL;
+            mLastWidgetWithModalFocus = nullptr;
             return;
         }
 
         if (mLastWidgetWithModalMouseInputFocus == widget)
         {
-            mLastWidgetWithModalMouseInputFocus = NULL;
+            mLastWidgetWithModalMouseInputFocus = nullptr;
             return;
         }
 
         if (mLastWidgetPressed == widget)
         {
-            mLastWidgetPressed = NULL;
+            mLastWidgetPressed = nullptr;
             return;
         }
     }
 
     void FocusHandler::focusNone()
     {
-        if (mFocusedWidget != NULL)
+        if (mFocusedWidget != nullptr)
         {
             Widget* focused = mFocusedWidget;
-            mFocusedWidget = NULL;
+            mFocusedWidget = nullptr;
 
             Event focusEvent(focused);
             distributeFocusLostEvent(focusEvent);
@@ -351,7 +351,7 @@ namespace gcn
 
     void FocusHandler::tabNext()
     {
-        if (mFocusedWidget != NULL)
+        if (mFocusedWidget != nullptr)
         {
             if (!mFocusedWidget->isTabOutEnabled())
             {
@@ -361,7 +361,7 @@ namespace gcn
 
         if (mWidgets.empty())
         {
-            mFocusedWidget = NULL;
+            mFocusedWidget = nullptr;
             return;
         }
 
@@ -404,7 +404,7 @@ namespace gcn
 
             if (mWidgets.at(focusedWidget)->isFocusable() &&
                 mWidgets.at(focusedWidget)->isTabInEnabled() &&
-                (mModalFocusedWidget == NULL ||
+                (mModalFocusedWidget == nullptr ||
                     mWidgets.at(focusedWidget)->isModalFocused()))
             {
                 done = true;
@@ -428,7 +428,7 @@ namespace gcn
 
     void FocusHandler::tabPrevious()
     {
-        if (mFocusedWidget != NULL)
+        if (mFocusedWidget != nullptr)
         {
             if (!mFocusedWidget->isTabOutEnabled())
             {
@@ -438,7 +438,7 @@ namespace gcn
 
         if (mWidgets.empty())
         {
-            mFocusedWidget = NULL;
+            mFocusedWidget = nullptr;
             return;
         }
 
@@ -481,7 +481,7 @@ namespace gcn
 
             if (mWidgets.at(focusedWidget)->isFocusable() &&
                 mWidgets.at(focusedWidget)->isTabInEnabled() &&
-                (mModalFocusedWidget == NULL ||
+                (mModalFocusedWidget == nullptr ||
                     mWidgets.at(focusedWidget)->isModalFocused()))
             {
                 done = true;
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 35eef7c..a022e93 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -138,7 +138,7 @@ namespace gcn
     void Graphics::drawText(const std::string& text, int x, int y,
                             Alignment alignment, bool enabled)
     {
-        if (mFont == NULL)
+        if (mFont == nullptr)
         {
             throw GCN_EXCEPTION("No font set.");
         }
diff --git a/src/gui.cpp b/src/gui.cpp
index 655c3ae..2edf3a0 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -81,7 +81,7 @@ namespace gcn
     {
         if (Widget::widgetExists(mTop))
         {
-            setTop(NULL);
+            setTop(nullptr);
         }
 
         delete mFocusHandler;
@@ -89,11 +89,11 @@ namespace gcn
 
     void Gui::setTop(Widget* top)
     {
-        if (mTop != NULL)
+        if (mTop != nullptr)
         {
-            mTop->_setFocusHandler(NULL);
+            mTop->_setFocusHandler(nullptr);
         }
-        if (top != NULL)
+        if (top != nullptr)
         {
             top->_setFocusHandler(mFocusHandler);
         }
@@ -128,7 +128,7 @@ namespace gcn
 
     void Gui::logic()
     {
-        if (mTop == NULL)
+        if (mTop == nullptr)
         {
             throw GCN_EXCEPTION("No top widget set");
         }
@@ -136,7 +136,7 @@ namespace gcn
         handleModalFocus();
         handleModalMouseInputFocus();
 
-        if (mInput != NULL)
+        if (mInput != nullptr)
         {
             mInput->_pollInput();
 
@@ -149,11 +149,11 @@ namespace gcn
 
     void Gui::draw()
     {
-        if (mTop == NULL)
+        if (mTop == nullptr)
         {
             throw GCN_EXCEPTION("No top widget set");
         }
-        if (mGraphics == NULL)
+        if (mGraphics == nullptr)
         {
             throw GCN_EXCEPTION("No graphics set");
         }
@@ -230,8 +230,8 @@ namespace gcn
             mControlPressed = keyInput.isControlPressed();
             mAltPressed = keyInput.isAltPressed();
 
-            KeyEvent keyEventToGlobalKeyListeners(NULL,
-                                                  NULL,
+            KeyEvent keyEventToGlobalKeyListeners(nullptr,
+                                                  nullptr,
                                                   mShiftPressed,
                                                   mControlPressed,
                                                   mAltPressed,
@@ -252,7 +252,7 @@ namespace gcn
             bool keyEventConsumed = false;
 
             // Send key inputs to the focused widgets
-            if (mFocusHandler->getFocused() != NULL)
+            if (mFocusHandler->getFocused() != nullptr)
             {
                 Widget* source = getKeyEventSource();
                 KeyEvent keyEvent(source,
@@ -368,9 +368,9 @@ namespace gcn
                 // If a widget has modal mouse input focus we
                 // only want to send entered events to that widget
                 // and the widget's parents.
-                if ((mFocusHandler->getModalMouseInputFocused() != NULL
+                if ((mFocusHandler->getModalMouseInputFocused() != nullptr
                      && widget->isModalMouseInputFocused())
-                    || mFocusHandler->getModalMouseInputFocused() == NULL)
+                    || mFocusHandler->getModalMouseInputFocused() == nullptr)
                 {
                     distributeMouseEvent(widget,
                                          MouseEvent::Entered,
@@ -382,7 +382,7 @@ namespace gcn
                 }
             }
         }
-        if (mFocusHandler->getDraggedWidget() != NULL)
+        if (mFocusHandler->getDraggedWidget() != nullptr)
         {
             distributeMouseEvent(mFocusHandler->getDraggedWidget(),
                                  MouseEvent::Dragged,
@@ -405,7 +405,7 @@ namespace gcn
     {
         Widget* sourceWidget = getMouseEventSource(mouseInput.getX(), mouseInput.getY());
 
-        if (mFocusHandler->getDraggedWidget() != NULL)
+        if (mFocusHandler->getDraggedWidget() != nullptr)
         {
             sourceWidget = mFocusHandler->getDraggedWidget();
         }
@@ -413,8 +413,8 @@ namespace gcn
         int sourceWidgetX, sourceWidgetY;
         sourceWidget->getAbsolutePosition(sourceWidgetX, sourceWidgetY);
 
-        if ((mFocusHandler->getModalFocused() != NULL && sourceWidget->isModalFocused())
-            || mFocusHandler->getModalFocused() == NULL)
+        if ((mFocusHandler->getModalFocused() != nullptr && sourceWidget->isModalFocused())
+            || mFocusHandler->getModalFocused() == nullptr)
         {
             sourceWidget->requestFocus();
         }
@@ -448,7 +448,7 @@ namespace gcn
     {
         Widget* sourceWidget = getMouseEventSource(mouseInput.getX(), mouseInput.getY());
 
-        if (mFocusHandler->getDraggedWidget() != NULL)
+        if (mFocusHandler->getDraggedWidget() != nullptr)
         {
             sourceWidget = mFocusHandler->getDraggedWidget();
         }
@@ -467,7 +467,7 @@ namespace gcn
     {
         Widget* sourceWidget = getMouseEventSource(mouseInput.getX(), mouseInput.getY());
 
-        if (mFocusHandler->getDraggedWidget() != NULL)
+        if (mFocusHandler->getDraggedWidget() != nullptr)
         {
             sourceWidget = mFocusHandler->getDraggedWidget();
         }
@@ -486,11 +486,11 @@ namespace gcn
     {
         Widget* sourceWidget = getMouseEventSource(mouseInput.getX(), mouseInput.getY());
 
-        if (mFocusHandler->getDraggedWidget() != NULL)
+        if (mFocusHandler->getDraggedWidget() != nullptr)
         {
             if (sourceWidget != mFocusHandler->getLastWidgetPressed())
             {
-                mFocusHandler->setLastWidgetPressed(NULL);
+                mFocusHandler->setLastWidgetPressed(nullptr);
             }
 
             sourceWidget = mFocusHandler->getDraggedWidget();
@@ -514,7 +514,7 @@ namespace gcn
                                  mouseInput.getX(),
                                  mouseInput.getY());
 
-            mFocusHandler->setLastWidgetPressed(NULL);
+            mFocusHandler->setLastWidgetPressed(nullptr);
         }
         else
         {
@@ -522,9 +522,9 @@ namespace gcn
             mClickCount = 0;
         }
 
-        if (mFocusHandler->getDraggedWidget() != NULL)
+        if (mFocusHandler->getDraggedWidget() != nullptr)
         {
-            mFocusHandler->setDraggedWidget(NULL);
+            mFocusHandler->setDraggedWidget(nullptr);
         }
     }
 
@@ -534,7 +534,7 @@ namespace gcn
         Widget* parent = mTop;
         Widget* child = mTop;
 
-        while (child != NULL)
+        while (child != nullptr)
         {
             Widget* swap = child;
             int parentX, parentY;
@@ -552,7 +552,7 @@ namespace gcn
 
         Widget* widget = mTop;
 
-        while (widget != NULL)
+        while (widget != nullptr)
         {
             result.insert(widget);
             int absoluteX, absoluteY;
@@ -567,7 +567,7 @@ namespace gcn
     {
         Widget* widget = getWidgetAt(x, y);
 
-        if (mFocusHandler->getModalMouseInputFocused() != NULL
+        if (mFocusHandler->getModalMouseInputFocused() != nullptr
             && !widget->isModalMouseInputFocused())
         {
             return mFocusHandler->getModalMouseInputFocused();
@@ -580,8 +580,8 @@ namespace gcn
     {
         Widget* widget = mFocusHandler->getFocused();
 
-        while (widget->_getInternalFocusHandler() != NULL
-               && widget->_getInternalFocusHandler()->getFocused() != NULL)
+        while (widget->_getInternalFocusHandler() != nullptr
+               && widget->_getInternalFocusHandler()->getFocused() != nullptr)
         {
             widget = widget->_getInternalFocusHandler()->getFocused();
         }
@@ -600,14 +600,14 @@ namespace gcn
         Widget* parent = source;
         Widget* widget = source;
 
-        if (mFocusHandler->getModalFocused() != NULL
+        if (mFocusHandler->getModalFocused() != nullptr
             && !widget->isModalFocused()
             && !force)
         {
             return;
         }
 
-        if (mFocusHandler->getModalMouseInputFocused() != NULL
+        if (mFocusHandler->getModalMouseInputFocused() != nullptr
             && !widget->isModalMouseInputFocused()
             && !force)
         {
@@ -626,7 +626,7 @@ namespace gcn
                               y,
                               mClickCount);
 
-        while (parent != NULL)
+        while (parent != nullptr)
         {
             // If the widget has been removed due to input
             // cancel the distribution.
@@ -698,8 +698,8 @@ namespace gcn
 
             // If a non modal focused widget has been reach
             // and we have modal focus cancel the distribution.
-            if (mFocusHandler->getModalFocused() != NULL
-                && widget != NULL
+            if (mFocusHandler->getModalFocused() != nullptr
+                && widget != nullptr
                 && !widget->isModalFocused())
             {
                 break;
@@ -707,8 +707,8 @@ namespace gcn
 
             // If a non modal mouse input focused widget has been reach
             // and we have modal mouse input focus cancel the distribution.
-            if (mFocusHandler->getModalMouseInputFocused() != NULL
-                && widget != NULL
+            if (mFocusHandler->getModalMouseInputFocused() != nullptr
+                && widget != nullptr
                 && !widget->isModalMouseInputFocused())
             {
                 break;
@@ -721,19 +721,19 @@ namespace gcn
         Widget* parent = keyEvent.getSource();
         Widget* widget = keyEvent.getSource();
 
-        if (mFocusHandler->getModalFocused() != NULL
+        if (mFocusHandler->getModalFocused() != nullptr
             && !widget->isModalFocused())
         {
             return;
         }
 
-        if (mFocusHandler->getModalMouseInputFocused() != NULL
+        if (mFocusHandler->getModalMouseInputFocused() != nullptr
             && !widget->isModalMouseInputFocused())
         {
             return;
         }
 
-        while (parent != NULL)
+        while (parent != nullptr)
         {
             // If the widget has been removed due to input
             // cancel the distribution.
@@ -774,7 +774,7 @@ namespace gcn
 
             // If a non modal focused widget has been reach
             // and we have modal focus cancel the distribution.
-            if (mFocusHandler->getModalFocused() != NULL
+            if (mFocusHandler->getModalFocused() != nullptr
                 && !widget->isModalFocused())
             {
                 break;
@@ -812,7 +812,7 @@ namespace gcn
         // Check if modal mouse input focus has been gained by a widget.
         if ((mFocusHandler->getLastWidgetWithModalMouseInputFocus() 
                 != mFocusHandler->getModalMouseInputFocused())
-             && (mFocusHandler->getLastWidgetWithModalMouseInputFocus() == NULL))
+             && (mFocusHandler->getLastWidgetWithModalMouseInputFocus() == nullptr))
         {
             handleModalFocusGained();
             mFocusHandler->setLastWidgetWithModalMouseInputFocus(mFocusHandler->getModalMouseInputFocused());
@@ -820,10 +820,10 @@ namespace gcn
         // Check if modal mouse input focus has been released.
         else if ((mFocusHandler->getLastWidgetWithModalMouseInputFocus()
                     != mFocusHandler->getModalMouseInputFocused())
-                    && (mFocusHandler->getLastWidgetWithModalMouseInputFocus() != NULL))
+                    && (mFocusHandler->getLastWidgetWithModalMouseInputFocus() != nullptr))
         {
             handleModalFocusReleased();
-            mFocusHandler->setLastWidgetWithModalMouseInputFocus(NULL);
+            mFocusHandler->setLastWidgetWithModalMouseInputFocus(nullptr);
         }
     }
 
@@ -832,7 +832,7 @@ namespace gcn
         // Check if modal focus has been gained by a widget.
         if ((mFocusHandler->getLastWidgetWithModalFocus() 
                 != mFocusHandler->getModalFocused())
-             && (mFocusHandler->getLastWidgetWithModalFocus() == NULL))
+             && (mFocusHandler->getLastWidgetWithModalFocus() == nullptr))
         {
             handleModalFocusGained();
             mFocusHandler->setLastWidgetWithModalFocus(mFocusHandler->getModalFocused());
@@ -840,10 +840,10 @@ namespace gcn
         // Check if modal focus has been released.
         else if ((mFocusHandler->getLastWidgetWithModalFocus()
                     != mFocusHandler->getModalFocused())
-                    && (mFocusHandler->getLastWidgetWithModalFocus() != NULL))
+                    && (mFocusHandler->getLastWidgetWithModalFocus() != nullptr))
         {
             handleModalFocusReleased();
-            mFocusHandler->setLastWidgetWithModalFocus(NULL);
+            mFocusHandler->setLastWidgetWithModalFocus(nullptr);
         }
     }
 
diff --git a/src/image.cpp b/src/image.cpp
index 58b2ead..1c3400d 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -66,7 +66,7 @@
 namespace gcn
 {
 
-    ImageLoader* Image::mImageLoader = NULL;
+    ImageLoader* Image::mImageLoader = nullptr;
 
     Image::Image()
     {
@@ -88,7 +88,7 @@ namespace gcn
 
     Image* Image::load(const std::string& filename, bool convertToDisplayFormat)
     {
-        if (mImageLoader == NULL)
+        if (mImageLoader == nullptr)
         {
             throw GCN_EXCEPTION("Trying to load an image but no image loader is set.");
         }
diff --git a/src/imagefont.cpp b/src/imagefont.cpp
index 3c47ec4..3aff936 100644
--- a/src/imagefont.cpp
+++ b/src/imagefont.cpp
@@ -116,9 +116,9 @@ namespace gcn
     ImageFont::ImageFont(Image* image, const std::string& glyphs)
     {
         mFilename = "Image*";
-        if (image == NULL)
+        if (image == nullptr)
         {
-            throw GCN_EXCEPTION("Font image is NULL");
+            throw GCN_EXCEPTION("Font image is nullptr");
         }
         mImage = image;
 
diff --git a/src/opengl/openglgraphics.cpp b/src/opengl/openglgraphics.cpp
index 1088e48..873f409 100644
--- a/src/opengl/openglgraphics.cpp
+++ b/src/opengl/openglgraphics.cpp
@@ -198,7 +198,7 @@ namespace gcn
     {
 	const OpenGLImage* srcImage = dynamic_cast<const OpenGLImage*>(image);
 
-        if (srcImage == NULL)
+        if (srcImage == nullptr)
         {
             throw GCN_EXCEPTION("Trying to draw an image of unknown format, must be an OpenGLImage.");
         }
diff --git a/src/opengl/openglimage.cpp b/src/opengl/openglimage.cpp
index 39cd3b2..3650919 100644
--- a/src/opengl/openglimage.cpp
+++ b/src/opengl/openglimage.cpp
@@ -166,14 +166,14 @@ namespace gcn
 
     void OpenGLImage::free()
     {
-		if (mPixels == NULL)
+		if (mPixels == nullptr)
 		{
 			glDeleteTextures(1, &mTextureHandle);
 		}
 		else
 		{
 			delete[] mPixels;
-			mPixels = NULL;
+			mPixels = nullptr;
 		}
     }
 
@@ -189,7 +189,7 @@ namespace gcn
 
     Color OpenGLImage::getPixel(int x, int y)
     {
-		if (mPixels == NULL)
+		if (mPixels == nullptr)
 		{
 			throw GCN_EXCEPTION("Image has been converted to display format");
 		}
@@ -218,7 +218,7 @@ namespace gcn
 
     void OpenGLImage::putPixel(int x, int y, const Color& color)
     {
-        if (mPixels == NULL)
+        if (mPixels == nullptr)
 		{
 			throw GCN_EXCEPTION("Image has been converted to display format");
 		}
@@ -239,7 +239,7 @@ namespace gcn
 
     void OpenGLImage::convertToDisplayFormat()
     {
-		if (mPixels == NULL)
+		if (mPixels == nullptr)
 		{
 			throw GCN_EXCEPTION("Image has already been converted to display format");
 		}
@@ -261,7 +261,7 @@ namespace gcn
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
         delete[] mPixels;
-		mPixels = NULL;
+		mPixels = nullptr;
 
         GLenum error = glGetError();
         if (error)
diff --git a/src/sdl/sdl2graphics.cpp b/src/sdl/sdl2graphics.cpp
index 1d55a8d..20b28b5 100644
--- a/src/sdl/sdl2graphics.cpp
+++ b/src/sdl/sdl2graphics.cpp
@@ -77,7 +77,7 @@ namespace gcn
 
     SDL2Graphics::~SDL2Graphics()
     {
-        if(mRenderTarget != NULL)
+        if(mRenderTarget != nullptr)
         {
             SDL_DestroyTexture(mTexture);
             SDL_FreeSurface(mTarget);
@@ -104,7 +104,7 @@ namespace gcn
         mRenderTarget = renderer;
         // An internal surface is still required to be able to handle surfaces and colorkeys
         mTarget = SDL_CreateRGBSurface(0, width, height, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
-        SDL_FillRect(mTarget, NULL, SDL_MapRGB(mTarget->format, 0xff, 0, 0xff));
+        SDL_FillRect(mTarget, nullptr, SDL_MapRGB(mTarget->format, 0xff, 0, 0xff));
         SDL_SetColorKey(mTarget, SDL_TRUE, SDL_MapRGB(mTarget->format, 0xff, 0, 0xff)); // magenta, Guisan default
         SDL_SetSurfaceBlendMode(mTarget, SDL_BLENDMODE_NONE); // needed to cleanup temp data properly
         mTexture = SDL_CreateTextureFromSurface(mRenderTarget, mTarget);
@@ -181,12 +181,12 @@ namespace gcn
 
         const SDLImage* srcImage = dynamic_cast<const SDLImage*>(image);
 
-        if (srcImage == NULL)
+        if (srcImage == nullptr)
         {
             throw GCN_EXCEPTION("Trying to draw an image of unknown format, must be an SDLImage.");
         }
         
-        if (srcImage->getTexture() == NULL)
+        if (srcImage->getTexture() == nullptr)
         {
             SDL_FillRect(mTarget, &temp, SDL_MapRGBA(mTarget->format, 0xff, 0, 0xff, 0));
             SDL_BlitSurface(srcImage->getSurface(), &src, mTarget, &temp);
diff --git a/src/sdl/sdlgraphics.cpp b/src/sdl/sdlgraphics.cpp
index 4907795..cfae933 100644
--- a/src/sdl/sdlgraphics.cpp
+++ b/src/sdl/sdlgraphics.cpp
@@ -161,7 +161,7 @@ namespace gcn
 
         const SDLImage* srcImage = dynamic_cast<const SDLImage*>(image);
 
-        if (srcImage == NULL)
+        if (srcImage == nullptr)
         {
             throw GCN_EXCEPTION("Trying to draw an image of unknown format, must be an SDLImage.");
         }
diff --git a/src/sdl/sdlimage.cpp b/src/sdl/sdlimage.cpp
index eb7f0d9..23cc97b 100644
--- a/src/sdl/sdlimage.cpp
+++ b/src/sdl/sdlimage.cpp
@@ -97,7 +97,7 @@ namespace gcn
 
     int SDLImage::getWidth() const
     {
-        if (mSurface == NULL)
+        if (mSurface == nullptr)
         {
             throw GCN_EXCEPTION("Trying to get the width of a non loaded image.");
         }
@@ -107,7 +107,7 @@ namespace gcn
 
     int SDLImage::getHeight() const
     {
-        if (mSurface == NULL)
+        if (mSurface == nullptr)
         {
             throw GCN_EXCEPTION("Trying to get the height of a non loaded image.");
         }
@@ -117,7 +117,7 @@ namespace gcn
 
     Color SDLImage::getPixel(int x, int y)
     {
-        if (mSurface == NULL)
+        if (mSurface == nullptr)
         {
             throw GCN_EXCEPTION("Trying to get a pixel from a non loaded image.");
         }
@@ -127,7 +127,7 @@ namespace gcn
 
     void SDLImage::putPixel(int x, int y, const Color& color)
     {
-        if (mSurface == NULL)
+        if (mSurface == nullptr)
         {
             throw GCN_EXCEPTION("Trying to put a pixel in a non loaded image.");
         }
@@ -137,7 +137,7 @@ namespace gcn
 
     void SDLImage::convertToDisplayFormat()
     {
-        if (mSurface == NULL)
+        if (mSurface == nullptr)
         {
             throw GCN_EXCEPTION("Trying to convert a non loaded image to display format.");
         }
@@ -172,9 +172,9 @@ namespace gcn
 
         SDL_Surface* tmp = SDL_ConvertSurfaceFormat(mSurface, surfaceMask, 0);
         SDL_FreeSurface(mSurface);
-        mSurface = NULL;
+        mSurface = nullptr;
 
-        if (tmp == NULL)
+        if (tmp == nullptr)
         {
             throw GCN_EXCEPTION("Unable to convert image to display format.");
         }
diff --git a/src/sdl/sdlimageloader.cpp b/src/sdl/sdlimageloader.cpp
index 8f86917..21587b6 100644
--- a/src/sdl/sdlimageloader.cpp
+++ b/src/sdl/sdlimageloader.cpp
@@ -73,7 +73,7 @@ namespace gcn
     {
         SDL_Surface *loadedSurface = loadSDLSurface(filename);
 
-        if (loadedSurface == NULL)
+        if (loadedSurface == nullptr)
         {
             throw GCN_EXCEPTION(
                     std::string("Unable to load image file: ") + filename);
@@ -82,7 +82,7 @@ namespace gcn
         SDL_Surface *surface = convertToStandardFormat(loadedSurface);
         SDL_FreeSurface(loadedSurface);
 
-        if (surface == NULL)
+        if (surface == nullptr)
         {
             throw GCN_EXCEPTION(
                     std::string("Not enough memory to load: ") + filename);
@@ -132,9 +132,9 @@ namespace gcn
                 0, 0, 32,
                 rmask, gmask, bmask, amask);
 
-        SDL_Surface *tmp = NULL;
+        SDL_Surface *tmp = nullptr;
 
-        if (colorSurface != NULL)
+        if (colorSurface != nullptr)
         {
             tmp = SDL_ConvertSurface(surface, colorSurface->format,
                                      SDL_SWSURFACE);
diff --git a/src/widget.cpp b/src/widget.cpp
index 5d89d85..e322428 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -89,7 +89,7 @@ namespace gcn
 
     Widget::~Widget()
     {
-        if (mParent != NULL)
+        if (mParent != nullptr)
         {
             mParent->remove(this);
         }
@@ -97,7 +97,7 @@ namespace gcn
         std::list<Widget*>::const_iterator childrenIter;
         for (childrenIter = mChildren.begin(); childrenIter != mChildren.end(); childrenIter++)
         {
-            (*childrenIter)->_setParent(NULL);
+            (*childrenIter)->_setParent(nullptr);
         }
 
         std::list<DeathListener*>::const_iterator deathIter;
@@ -107,7 +107,7 @@ namespace gcn
             (*deathIter)->death(event);
         }
 
-        _setFocusHandler(NULL);
+        _setFocusHandler(nullptr);
 
         mWidgetInstances.remove(this);
     }
@@ -277,7 +277,7 @@ namespace gcn
 
     void Widget::requestFocus()
     {
-        if (mFocusHandler == NULL)
+        if (mFocusHandler == nullptr)
         {
             throw GCN_EXCEPTION("No focushandler set (did you add the widget to the gui?).");
         }
@@ -325,7 +325,7 @@ namespace gcn
 
     bool Widget::isVisible() const
     {
-        if (getParent() == NULL)
+        if (getParent() == nullptr)
         {
             return mVisible;
         }
@@ -390,7 +390,7 @@ namespace gcn
 
         mFocusHandler = focusHandler;
 
-        if (mInternalFocusHandler != NULL)
+        if (mInternalFocusHandler != nullptr)
         {
             return;
         }
@@ -472,7 +472,7 @@ namespace gcn
 
     void Widget::getAbsolutePosition(int& x, int& y) const
     {
-        if (getParent() == NULL)
+        if (getParent() == nullptr)
         {
             x = mDimension.x;
             y = mDimension.y;
@@ -490,9 +490,9 @@ namespace gcn
 
     Font* Widget::getFont() const
     {
-        if (mCurrentFont == NULL)
+        if (mCurrentFont == nullptr)
         {
-            if (mGlobalFont == NULL)
+            if (mGlobalFont == nullptr)
             {
                 return &mDefaultFont;
             }
@@ -510,7 +510,7 @@ namespace gcn
         std::list<Widget*>::iterator iter;
         for (iter = mWidgetInstances.begin(); iter != mWidgetInstances.end(); ++iter)
         {
-            if ((*iter)->mCurrentFont == NULL)
+            if ((*iter)->mCurrentFont == nullptr)
             {
                 (*iter)->fontChanged();
             }
@@ -578,7 +578,7 @@ namespace gcn
 
     void Widget::requestModalFocus()
     {
-        if (mFocusHandler == NULL)
+        if (mFocusHandler == nullptr)
         {
             throw GCN_EXCEPTION("No focushandler set (did you add the widget to the gui?).");
         }
@@ -588,7 +588,7 @@ namespace gcn
 
     void Widget::requestModalMouseInputFocus()
     {
-        if (mFocusHandler == NULL)
+        if (mFocusHandler == nullptr)
         {
             throw GCN_EXCEPTION("No focushandler set (did you add the widget to the gui?).");
         }
@@ -598,7 +598,7 @@ namespace gcn
 
     void Widget::releaseModalFocus()
     {
-        if (mFocusHandler == NULL)
+        if (mFocusHandler == nullptr)
         {
             return;
         }
@@ -608,7 +608,7 @@ namespace gcn
 
     void Widget::releaseModalMouseInputFocus()
     {
-        if (mFocusHandler == NULL)
+        if (mFocusHandler == nullptr)
         {
             return;
         }
@@ -618,12 +618,12 @@ namespace gcn
 
     bool Widget::isModalFocused() const
     {
-        if (mFocusHandler == NULL)
+        if (mFocusHandler == nullptr)
         {
             throw GCN_EXCEPTION("No focushandler set (did you add the widget to the gui?).");
         }
 
-        if (getParent() != NULL)
+        if (getParent() != nullptr)
         {
             return (mFocusHandler->getModalFocused() == this) || getParent()->isModalFocused();
         }
@@ -633,12 +633,12 @@ namespace gcn
 
     bool Widget::isModalMouseInputFocused() const
     {
-        if (mFocusHandler == NULL)
+        if (mFocusHandler == nullptr)
         {
             throw GCN_EXCEPTION("No focushandler set (did you add the widget to the gui?).");
         }
 
-        if (getParent() != NULL)
+        if (getParent() != nullptr)
         {
             return (mFocusHandler->getModalMouseInputFocused() == this) || getParent()->isModalMouseInputFocused();
         }
@@ -652,7 +652,7 @@ namespace gcn
 
         if (!r.isContaining(x, y))
         {
-            return NULL;
+            return nullptr;
         }
 
         x -= r.x;
@@ -666,7 +666,7 @@ namespace gcn
                 return widget;
             }
         }
-        return NULL;
+        return nullptr;
     }
 
     const std::list<MouseListener*>& Widget::_getMouseListeners()
@@ -701,7 +701,7 @@ namespace gcn
         std::list<Widget*>::const_iterator iter;
         for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
         {
-            if (mInternalFocusHandler == NULL)
+            if (mInternalFocusHandler == nullptr)
             {
                 (*iter)->_setFocusHandler(_getFocusHandler());
             }
@@ -778,7 +778,7 @@ namespace gcn
 
     void Widget::showPart(Rectangle rectangle)
     {
-        if (mParent != NULL)
+        if (mParent != nullptr)
         {
             mParent->showWidgetPart(this, rectangle);
         }
@@ -786,12 +786,12 @@ namespace gcn
 
     Widget* Widget::getTop() const
     {
-        if (getParent() == NULL) return NULL;
+        if (getParent() == nullptr) return nullptr;
 
         Widget* widget = getParent();
         Widget* parent = getParent()->getParent();
 
-        while (parent != NULL)
+        while (parent != nullptr)
         {
             widget = parent;
             parent = parent->getParent();
@@ -852,13 +852,13 @@ namespace gcn
 
             Widget* child = widget->findWidgetById(id);
 
-            if (child != NULL)
+            if (child != nullptr)
             {
                 return child;
             }
         }
 
-        return NULL;
+        return nullptr;
     }
 
     void Widget::showWidgetPart(Widget* widget, Rectangle area)
@@ -895,8 +895,8 @@ namespace gcn
         for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
         {
             Widget* widget = (*iter);
-            widget->_setFocusHandler(NULL);
-            widget->_setParent(NULL);
+            widget->_setFocusHandler(nullptr);
+            widget->_setParent(nullptr);
         }
 
         mChildren.clear();
@@ -910,8 +910,8 @@ namespace gcn
             if (*iter == widget)
             {
                 mChildren.erase(iter);
-                widget->_setFocusHandler(NULL);
-                widget->_setParent(NULL);
+                widget->_setFocusHandler(nullptr);
+                widget->_setParent(nullptr);
                 return;
             }
         }
@@ -923,7 +923,7 @@ namespace gcn
     {
         mChildren.push_back(widget);
 
-        if (mInternalFocusHandler == NULL)
+        if (mInternalFocusHandler == nullptr)
         {
             widget->_setFocusHandler(_getFocusHandler());
         }
diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
index 37b6610..166b3b9 100644
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -110,7 +110,7 @@ namespace gcn
         if (mInternalListBox)
             delete mListBox;
 
-        setInternalFocusHandler(NULL);
+        setInternalFocusHandler(nullptr);
     }
 
     void DropDown::draw(Graphics* graphics)
@@ -386,10 +386,10 @@ namespace gcn
 
     void DropDown::adjustHeight()
     {
-        if (mScrollArea == NULL)
+        if (mScrollArea == nullptr)
             throw GCN_EXCEPTION("Scroll Area has been deleted.");
 
-    if (mListBox == NULL)
+    if (mListBox == nullptr)
         throw GCN_EXCEPTION("List box has been deleted.");
 
         int listBoxHeight = mListBox->getHeight();
@@ -466,7 +466,7 @@ namespace gcn
     {
         if (event.getSource() == mScrollArea)
         {
-            mScrollArea = NULL;
+            mScrollArea = nullptr;
         }
     }
 
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 4327093..7ad2338 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -108,7 +108,7 @@ namespace gcn
 
     void Icon::draw(Graphics* graphics)
     {
-        if (mImage != NULL)
+        if (mImage != nullptr)
         {
             const int x = (getWidth() - mImage->getWidth()) / 2;
             const int y = (getHeight() - mImage->getHeight()) / 2;
diff --git a/src/widgets/listbox.cpp b/src/widgets/listbox.cpp
index f849a73..4606b91 100644
--- a/src/widgets/listbox.cpp
+++ b/src/widgets/listbox.cpp
@@ -87,7 +87,7 @@ namespace gcn
         graphics->setColor(getBackgroundColor());
         graphics->fillRectangle(Rectangle(0, 0, getWidth(), getHeight()));
 
-        if (mListModel == NULL)
+        if (mListModel == nullptr)
         {
             return;
         }
@@ -171,7 +171,7 @@ namespace gcn
 
     void ListBox::setSelected(int selected)
     {
-        if (mListModel == NULL)
+        if (mListModel == nullptr)
         {
             mSelected = -1;
         }
@@ -311,7 +311,7 @@ namespace gcn
 
     void ListBox::adjustSize()
     {
-        if (mListModel != NULL)
+        if (mListModel != nullptr)
         {
             int maxElementWidth = getWidth();
             for (int i = 0; i < mListModel->getNumberOfElements(); i++)
diff --git a/src/widgets/scrollarea.cpp b/src/widgets/scrollarea.cpp
index 6769106..b9a033b 100644
--- a/src/widgets/scrollarea.cpp
+++ b/src/widgets/scrollarea.cpp
@@ -82,12 +82,12 @@ namespace gcn
 
     ScrollArea::~ScrollArea()
     {
-        setContent(NULL);
+        setContent(nullptr);
     }
 
     void ScrollArea::setContent(Widget* widget)
     {
-        if (widget != NULL)
+        if (widget != nullptr)
         {
             clear();
             add(widget);
@@ -108,7 +108,7 @@ namespace gcn
             return *mChildren.begin();
         }
 
-        return NULL;
+        return nullptr;
     }
 
     void ScrollArea::setHorizontalScrollPolicy(ScrollPolicy hPolicy)
@@ -193,7 +193,7 @@ namespace gcn
     {
         checkPolicies();
 
-        if (getContent() == NULL)
+        if (getContent() == nullptr)
         {
             return 0;
         }
@@ -213,7 +213,7 @@ namespace gcn
     {
         checkPolicies();
 
-        if (getContent() == NULL)
+        if (getContent() == nullptr)
         {
             return 0;
         }
@@ -751,7 +751,7 @@ namespace gcn
         setVerticalScrollAmount(getVerticalScrollAmount());
         setHorizontalScrollAmount(getHorizontalScrollAmount());
 
-        if (getContent() != NULL)
+        if (getContent() != nullptr)
         {
             getContent()->setPosition(-mHScroll + getContent()->getFrameSize(),
                                       -mVScroll + getContent()->getFrameSize());
@@ -1092,7 +1092,7 @@ namespace gcn
             return getContent();
         }
 
-        return NULL;
+        return nullptr;
     }
 
     void ScrollArea::mouseWheelMovedUp(MouseEvent& mouseEvent)
diff --git a/src/widgets/tab.cpp b/src/widgets/tab.cpp
index 14f749b..c1be8ed 100644
--- a/src/widgets/tab.cpp
+++ b/src/widgets/tab.cpp
@@ -86,7 +86,7 @@ namespace gcn
     {
         setSize(mLabel->getWidth() + 12, mLabel->getHeight() + 12);
 
-        if (mTabbedArea != NULL)
+        if (mTabbedArea != nullptr)
         {
             mTabbedArea->adjustTabPositions();
         }
@@ -126,7 +126,7 @@ namespace gcn
         Color borderColor;
         Color baseColor;
 
-        if ((mTabbedArea != NULL && mTabbedArea->isTabSelected(this)) || mHasMouse)
+        if ((mTabbedArea != nullptr && mTabbedArea->isTabSelected(this)) || mHasMouse)
         {
             // Draw a border.
             graphics->setColor(highlightColor);
@@ -158,7 +158,7 @@ namespace gcn
         graphics->setColor(baseColor);
         graphics->fillRectangle(Rectangle(0, 0, currentClipArea.width, currentClipArea.height));
 
-        if (mTabbedArea != NULL && mTabbedArea->isFocused() && mTabbedArea->isTabSelected(this)
+        if (mTabbedArea != nullptr && mTabbedArea->isFocused() && mTabbedArea->isTabSelected(this)
             //            && mHasMouse)
             && mTabbedArea->isTabActive())
         {
diff --git a/src/widgets/tabbedarea.cpp b/src/widgets/tabbedarea.cpp
index b3c5042..c397672 100644
--- a/src/widgets/tabbedarea.cpp
+++ b/src/widgets/tabbedarea.cpp
@@ -117,7 +117,7 @@ namespace gcn
         mTabContainer->add(tab);
         mTabs.push_back(std::pair<Tab*, Widget*>(tab, widget));
 
-        if (mSelectedTab == NULL)
+        if (mSelectedTab == nullptr)
         {
             setSelectedTab(tab);
         }
@@ -184,7 +184,7 @@ namespace gcn
 
         if (tabIndexToBeSelected == -1)
         {
-            mSelectedTab = NULL;
+            mSelectedTab = nullptr;
             mWidgetContainer->clear();
         }
         else
@@ -313,7 +313,7 @@ namespace gcn
 
         // If a tab is selected,
         // remove the line right underneath the selected tab.
-        if (mSelectedTab != NULL)
+        if (mSelectedTab != nullptr)
         {
             graphics->setColor(getBaseColor());
             graphics->drawLine(mSelectedTab->getX() + 1,
@@ -478,7 +478,7 @@ namespace gcn
             Widget* widget = mTabContainer->getWidgetAt(mouseEvent.getX(), mouseEvent.getY());
             Tab* tab = dynamic_cast<Tab*>(widget);
 
-            if (tab != NULL)
+            if (tab != nullptr)
             {
                 setSelectedTab(tab);
                 tabActive = true;
@@ -487,7 +487,7 @@ namespace gcn
             else
             {
                 widget = mWidgetContainer->getWidgetAt(mouseEvent.getX(), mouseEvent.getY());
-                if (widget == NULL)
+                if (widget == nullptr)
                 {
                     mouseEvent.consume();
                 }
@@ -521,7 +521,7 @@ namespace gcn
         Widget* source = actionEvent.getSource();
         Tab* tab = dynamic_cast<Tab*>(source);
 
-        if (tab == NULL)
+        if (tab == nullptr)
         {
             throw GCN_EXCEPTION("Received an action from a widget that's not a tab!");
         }
diff --git a/src/widgets/textbox.cpp b/src/widgets/textbox.cpp
index c33b274..cfad02f 100644
--- a/src/widgets/textbox.cpp
+++ b/src/widgets/textbox.cpp
@@ -184,7 +184,7 @@ namespace gcn
         {
             Widget* par = getParent();
 
-            if (par != NULL)
+            if (par != nullptr)
             {
                 int rowsPerPage = par->getChildrenArea().height / getFont()->getHeight();
                 mText->setCaretRow(mText->getCaretRow() - rowsPerPage);
@@ -195,7 +195,7 @@ namespace gcn
         {
             Widget* par = getParent();
 
-            if (par != NULL)
+            if (par != nullptr)
             {
                 int rowsPerPage = par->getChildrenArea().height / getFont()->getHeight();
                 mText->setCaretRow(mText->getCaretRow() + rowsPerPage);
diff --git a/src/widgets/window.cpp b/src/widgets/window.cpp
index d7786e6..296677d 100644
--- a/src/widgets/window.cpp
+++ b/src/widgets/window.cpp
@@ -247,7 +247,7 @@ namespace gcn
             return;
         }
 
-        if (getParent() != NULL)
+        if (getParent() != nullptr)
         {
             getParent()->moveToTop(this);
         }

From 03625ebc7a4ae83ea07f744bf920740aab161155 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Tue, 24 Sep 2024 18:41:14 +0200
Subject: [PATCH 08/19] [CI] Add build with visual studio (project generated
 with premake).

---
 .github/workflows/windows-premake-msvc.yaml |  30 +++
 Guisan.sln                                  |  44 ----
 Guisan.vcxproj                              | 268 --------------------
 premake5.lua                                | 189 ++++++++++++++
 4 files changed, 219 insertions(+), 312 deletions(-)
 create mode 100644 .github/workflows/windows-premake-msvc.yaml
 delete mode 100644 Guisan.sln
 delete mode 100644 Guisan.vcxproj
 create mode 100644 premake5.lua

diff --git a/.github/workflows/windows-premake-msvc.yaml b/.github/workflows/windows-premake-msvc.yaml
new file mode 100644
index 0000000..f0a57d4
--- /dev/null
+++ b/.github/workflows/windows-premake-msvc.yaml
@@ -0,0 +1,30 @@
+name: Windows-premake-msvc
+on: [push, pull_request]
+jobs:
+  Build-Guisan:
+    runs-on: windows-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: install premake5
+      uses: Jarod42/install-premake5@v1
+
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: run premake5
+      run: premake5.exe vs2022 --to=solution/vs2022
+
+    - name: build
+      run: |
+        cd solution/vs2022
+        nuget install packages.config -OutputDirectory packages
+        msbuild.exe /property:Configuration=Release Guisan.sln
+
+    - name: artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: guisan-msvc
+        path: |
+          solution/vs2022/bin/Release/**.*
diff --git a/Guisan.sln b/Guisan.sln
deleted file mode 100644
index a20750f..0000000
--- a/Guisan.sln
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2000
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Guisan", "Guisan.vcxproj", "{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo", "demo\ff\Demo.vcxproj", "{C38D3313-382B-41C3-8CCE-AC2EBC51DCA7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C} = {3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}.Debug|x64.ActiveCfg = Debug|x64
-		{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}.Debug|x64.Build.0 = Debug|x64
-		{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}.Debug|x86.ActiveCfg = Debug|Win32
-		{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}.Debug|x86.Build.0 = Debug|Win32
-		{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}.Release|x64.ActiveCfg = Release|x64
-		{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}.Release|x64.Build.0 = Release|x64
-		{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}.Release|x86.ActiveCfg = Release|Win32
-		{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}.Release|x86.Build.0 = Release|Win32
-		{C38D3313-382B-41C3-8CCE-AC2EBC51DCA7}.Debug|x64.ActiveCfg = Debug|x64
-		{C38D3313-382B-41C3-8CCE-AC2EBC51DCA7}.Debug|x64.Build.0 = Debug|x64
-		{C38D3313-382B-41C3-8CCE-AC2EBC51DCA7}.Debug|x86.ActiveCfg = Debug|Win32
-		{C38D3313-382B-41C3-8CCE-AC2EBC51DCA7}.Debug|x86.Build.0 = Debug|Win32
-		{C38D3313-382B-41C3-8CCE-AC2EBC51DCA7}.Release|x64.ActiveCfg = Release|x64
-		{C38D3313-382B-41C3-8CCE-AC2EBC51DCA7}.Release|x64.Build.0 = Release|x64
-		{C38D3313-382B-41C3-8CCE-AC2EBC51DCA7}.Release|x86.ActiveCfg = Release|Win32
-		{C38D3313-382B-41C3-8CCE-AC2EBC51DCA7}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {731FE13E-F08A-4C7F-8C8E-B68F553CF59C}
-	EndGlobalSection
-EndGlobal
diff --git a/Guisan.vcxproj b/Guisan.vcxproj
deleted file mode 100644
index 49635ca..0000000
--- a/Guisan.vcxproj
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{3F89CFFD-556A-404C-8E6E-9F7BF5C5525C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\include;C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\include;C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\include;C:\Users\Gwilherm\SDL\SDL2-2.0.8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>SDL2.lib;SDL2_image.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-    <Lib>
-      <AdditionalLibraryDirectories>C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\lib\x86;C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\lib\x86;C:\Users\Gwilherm\SDL\SDL2-2.0.8\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>.\include;C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\include;C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\include;C:\Users\Gwilherm\SDL\SDL2-2.0.8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>SDL2.lib;SDL2_image.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-    <Lib>
-      <AdditionalLibraryDirectories>C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\lib\x86;C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\lib\x86;C:\Users\Gwilherm\SDL\SDL2-2.0.8\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\include;C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\include;C:\Users\Gwilherm\SDL\SDL2-2.0.8\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\lib\x64;C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\lib\x64;C:\Users\Gwilherm\SDL\SDL2-2.0.8\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>SDL2.lib;SDL2_image.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\include;C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\include;C:\Users\Gwilherm\SDL\SDL2-2.0.8\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>C:\Users\Gwilherm\SDL\SDL2_ttf-2.0.14\lib\x64;C:\Users\Gwilherm\SDL\SDL2_image-2.0.3\lib\x64;C:\Users\Gwilherm\SDL\SDL2-2.0.8\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>SDL2.lib;SDL2_image.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="src\actionevent.cpp" />
-    <ClCompile Include="src\cliprectangle.cpp" />
-    <ClCompile Include="src\color.cpp" />
-    <ClCompile Include="src\containerevent.cpp" />
-    <ClCompile Include="src\defaultfont.cpp" />
-    <ClCompile Include="src\event.cpp" />
-    <ClCompile Include="src\exception.cpp" />
-    <ClCompile Include="src\focushandler.cpp" />
-    <ClCompile Include="src\font.cpp" />
-    <ClCompile Include="src\genericinput.cpp" />
-    <ClCompile Include="src\graphics.cpp" />
-    <ClCompile Include="src\gui.cpp" />
-    <ClCompile Include="src\guisan.cpp" />
-    <ClCompile Include="src\image.cpp" />
-    <ClCompile Include="src\imagefont.cpp" />
-    <ClCompile Include="src\inputevent.cpp" />
-    <ClCompile Include="src\key.cpp" />
-    <ClCompile Include="src\keyevent.cpp" />
-    <ClCompile Include="src\keyinput.cpp" />
-    <ClCompile Include="src\mouseevent.cpp" />
-    <ClCompile Include="src\mouseinput.cpp" />
-    <ClCompile Include="src\opengl\opengl.cpp" />
-    <ClCompile Include="src\opengl\openglgraphics.cpp" />
-    <ClCompile Include="src\opengl\openglimage.cpp" />
-    <ClCompile Include="src\rectangle.cpp" />
-    <ClCompile Include="src\sdl\sdl.cpp" />
-    <ClCompile Include="src\sdl\sdl2graphics.cpp" />
-    <ClCompile Include="src\sdl\sdlgraphics.cpp" />
-    <ClCompile Include="src\sdl\sdlimage.cpp" />
-    <ClCompile Include="src\sdl\sdlimageloader.cpp" />
-    <ClCompile Include="src\sdl\sdlinput.cpp" />
-    <ClCompile Include="src\sdl\sdltruetypefont.cpp" />
-    <ClCompile Include="src\selectionevent.cpp" />
-    <ClCompile Include="src\widget.cpp" />
-    <ClCompile Include="src\widgets\button.cpp" />
-    <ClCompile Include="src\widgets\checkbox.cpp" />
-    <ClCompile Include="src\widgets\container.cpp" />
-    <ClCompile Include="src\widgets\dropdown.cpp" />
-    <ClCompile Include="src\widgets\icon.cpp" />
-    <ClCompile Include="src\widgets\imagebutton.cpp" />
-    <ClCompile Include="src\widgets\imagetextbutton.cpp" />
-    <ClCompile Include="src\widgets\inputbox.cpp" />
-    <ClCompile Include="src\widgets\label.cpp" />
-    <ClCompile Include="src\widgets\listbox.cpp" />
-    <ClCompile Include="src\widgets\progressbar.cpp" />
-    <ClCompile Include="src\widgets\radiobutton.cpp" />
-    <ClCompile Include="src\widgets\scrollarea.cpp" />
-    <ClCompile Include="src\widgets\slider.cpp" />
-    <ClCompile Include="src\widgets\tab.cpp" />
-    <ClCompile Include="src\widgets\tabbedarea.cpp" />
-    <ClCompile Include="src\widgets\textbox.cpp" />
-    <ClCompile Include="src\widgets\textfield.cpp" />
-    <ClCompile Include="src\widgets\togglebutton.cpp" />
-    <ClCompile Include="src\widgets\window.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="include\guisan.hpp" />
-    <ClInclude Include="include\guisan\actionevent.hpp" />
-    <ClInclude Include="include\guisan\actionlistener.hpp" />
-    <ClInclude Include="include\guisan\cliprectangle.hpp" />
-    <ClInclude Include="include\guisan\color.hpp" />
-    <ClInclude Include="include\guisan\containerevent.hpp" />
-    <ClInclude Include="include\guisan\containerlistener.hpp" />
-    <ClInclude Include="include\guisan\deathlistener.hpp" />
-    <ClInclude Include="include\guisan\defaultfont.hpp" />
-    <ClInclude Include="include\guisan\event.hpp" />
-    <ClInclude Include="include\guisan\exception.hpp" />
-    <ClInclude Include="include\guisan\focushandler.hpp" />
-    <ClInclude Include="include\guisan\focuslistener.hpp" />
-    <ClInclude Include="include\guisan\font.hpp" />
-    <ClInclude Include="include\guisan\genericinput.hpp" />
-    <ClInclude Include="include\guisan\glut.hpp" />
-    <ClInclude Include="include\guisan\graphics.hpp" />
-    <ClInclude Include="include\guisan\gui.hpp" />
-    <ClInclude Include="include\guisan\image.hpp" />
-    <ClInclude Include="include\guisan\imagefont.hpp" />
-    <ClInclude Include="include\guisan\imageloader.hpp" />
-    <ClInclude Include="include\guisan\input.hpp" />
-    <ClInclude Include="include\guisan\inputevent.hpp" />
-    <ClInclude Include="include\guisan\key.hpp" />
-    <ClInclude Include="include\guisan\keyevent.hpp" />
-    <ClInclude Include="include\guisan\keyinput.hpp" />
-    <ClInclude Include="include\guisan\keylistener.hpp" />
-    <ClInclude Include="include\guisan\listmodel.hpp" />
-    <ClInclude Include="include\guisan\mouseevent.hpp" />
-    <ClInclude Include="include\guisan\mouseinput.hpp" />
-    <ClInclude Include="include\guisan\mouselistener.hpp" />
-    <ClInclude Include="include\guisan\opengl.hpp" />
-    <ClInclude Include="include\guisan\opengl\openglgraphics.hpp" />
-    <ClInclude Include="include\guisan\opengl\openglimage.hpp" />
-    <ClInclude Include="include\guisan\opengl\openglsdlimageloader.hpp" />
-    <ClInclude Include="include\guisan\platform.hpp" />
-    <ClInclude Include="include\guisan\rectangle.hpp" />
-    <ClInclude Include="include\guisan\sdl.hpp" />
-    <ClInclude Include="include\guisan\sdl\sdlgraphics.hpp" />
-    <ClInclude Include="include\guisan\sdl\sdlimage.hpp" />
-    <ClInclude Include="include\guisan\sdl\sdlimageloader.hpp" />
-    <ClInclude Include="include\guisan\sdl\sdlinput.hpp" />
-    <ClInclude Include="include\guisan\sdl\sdlpixel.hpp" />
-    <ClInclude Include="include\guisan\sdl\sdltruetypefont.hpp" />
-    <ClInclude Include="include\guisan\selectionevent.hpp" />
-    <ClInclude Include="include\guisan\selectionlistener.hpp" />
-    <ClInclude Include="include\guisan\widget.hpp" />
-    <ClInclude Include="include\guisan\widgetlistener.hpp" />
-    <ClInclude Include="include\guisan\widgets\button.hpp" />
-    <ClInclude Include="include\guisan\widgets\checkbox.hpp" />
-    <ClInclude Include="include\guisan\widgets\container.hpp" />
-    <ClInclude Include="include\guisan\widgets\dropdown.hpp" />
-    <ClInclude Include="include\guisan\widgets\icon.hpp" />
-    <ClInclude Include="include\guisan\widgets\imagebutton.hpp" />
-    <ClInclude Include="include\guisan\widgets\imagetextbutton.hpp" />
-    <ClInclude Include="include\guisan\widgets\inputbox.hpp" />
-    <ClInclude Include="include\guisan\widgets\label.hpp" />
-    <ClInclude Include="include\guisan\widgets\listbox.hpp" />
-    <ClInclude Include="include\guisan\widgets\progressbar.hpp" />
-    <ClInclude Include="include\guisan\widgets\radiobutton.hpp" />
-    <ClInclude Include="include\guisan\widgets\scrollarea.hpp" />
-    <ClInclude Include="include\guisan\widgets\slider.hpp" />
-    <ClInclude Include="include\guisan\widgets\tab.hpp" />
-    <ClInclude Include="include\guisan\widgets\tabbedarea.hpp" />
-    <ClInclude Include="include\guisan\widgets\textbox.hpp" />
-    <ClInclude Include="include\guisan\widgets\textfield.hpp" />
-    <ClInclude Include="include\guisan\widgets\togglebutton.hpp" />
-    <ClInclude Include="include\guisan\widgets\window.hpp" />
-    <ClInclude Include="include\guisan\x.hpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/premake5.lua b/premake5.lua
new file mode 100644
index 0000000..236bb32
--- /dev/null
+++ b/premake5.lua
@@ -0,0 +1,189 @@
+newoption {
+	trigger = "to",
+	value   = "path",
+	description = "Set the output location for the generated files"
+}
+
+if (_ACTION == nil) then
+	return
+end
+
+local locationDir = _OPTIONS["to"] or path.join("solution", _ACTION, "stratagus")
+
+local nugetPackages = {
+	"sdl2.nuget:2.28.0", "sdl2.nuget.redist:2.28.0",
+	"sdl2_image.nuget:2.6.3", "sdl2_image.nuget.redist:2.6.3",
+	"sdl2_mixer.nuget:2.6.3", "sdl2_mixer.nuget.redist:2.6.3",
+	"sdl2_net.nuget:2.2.0", "sdl2_net.nuget.redist:2.2.0",
+	"sdl2_ttf.nuget:2.20.2", "sdl2_ttf.nuget.redist:2.20.2"
+}
+
+function useGuisan()
+	includedirs { "include/" }
+	links { "guisan" }
+end
+
+-- ----------------------------------------------------------------------------
+workspace "Guisan"
+	location(locationDir)
+	configurations {"Debug", "Release"}
+
+	language "C++"
+	cppdialect "C++14"
+
+	objdir(path.join(locationDir, "obj")) -- premake adds $(configName)/$(AppName)
+	targetdir(path.join(locationDir, "bin/%{cfg.buildcfg}"))
+
+	startproject "guisan"
+
+	externalwarnings "Off"
+
+	warnings "Extra"
+	--flags { "FatalWarnings"}
+
+	filter { "action:vs*" }
+		nuget(nugetPackages)
+		defines { "_CRT_SECURE_NO_WARNINGS" } -- 4996: '$func': This function or variable may be unsafe. Consider using $func2 instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+
+	filter { "toolset:msc*" }
+		buildoptions { "/Zc:__cplusplus" } -- else __cplusplus would be 199711L
+		-- buildoptions {"/Za"} -- Disable language extensions
+		-- Error from <winnt.h>
+			--"2133", -- '%array_var': unknown size
+			--"2467", -- illegal declaration of anonymous struct
+		disablewarnings {
+			"4018", -- '<': signed/unsigned mismatch
+			"4100", -- '%var': unreferenced formal parameter
+			"4127", -- conditional expression is constant
+			"4189", -- '%var': local variable is initialized but not referenced
+			"4244", -- '=': conversion from '$type1' to '$type2', possible loss of data
+			"4458", -- declaration of '$var' hides class member
+		}
+	filter { "configurations:Debug" }
+		symbols "On"
+		defines { "DEBUG" }
+		optimize "Off"
+
+	filter { "configurations:Release" }
+		symbols "Off"
+		defines { "NDEBUG" }
+		optimize "On"
+
+	filter "system:windows"
+		defines { "NOMINMAX", "WIN32", "USE_WIN32" }
+
+-- ----------------------------------------------------------------------------
+project "guisan"
+	kind "StaticLib"
+	targetname "guisan"
+
+	files { "src/**.cpp", "include/**.hpp" }
+	files { "src/SConscript" }
+	files { "*.*"}
+
+	includedirs { "include" }
+
+-- ----------------------------------------------------------------------------
+group "examples"
+-- ----------------------------------------------------------------------------
+project "opengl_helloworld"
+	kind "WindowedApp"
+	targetname "opengl_helloworld"
+
+	files { "examples/openglhelloworld.cpp", "examples/opengl_helper.hpp", "examples/helloworld_example.hpp" }
+
+	includedirs { "include" }
+	links { "guisan" }
+	links {"opengl32"}
+
+	debugdir "examples"
+
+-- ----------------------------------------------------------------------------
+project "opengl_widgets"
+	kind "WindowedApp"
+	targetname "opengl_widgets"
+
+	files { "examples/openglwidgets.cpp", "examples/opengl_helper.hpp", "examples/widgets_example.hpp" }
+
+	includedirs { "include" }
+	links { "guisan" }
+	links {"opengl32"}
+
+	debugdir "examples"
+
+-- ----------------------------------------------------------------------------
+project "sdl_action"
+	kind "WindowedApp"
+	targetname "sdl_action"
+
+	files { "examples/sdlaction.cpp", "examples/sdl_helper.hpp", "examples/action_example.hpp" }
+
+	includedirs { "include" }
+	links { "guisan" }
+
+	debugdir "examples"
+
+-- ----------------------------------------------------------------------------
+project "sdl_hello"
+	kind "WindowedApp"
+	targetname "sdl_hello"
+
+	files { "examples/sdlhelloworld.cpp", "examples/sdl_helper.hpp", "examples/helloworld_example.hpp" }
+
+	includedirs { "include" }
+	links { "guisan" }
+
+	debugdir "examples"
+
+-- ----------------------------------------------------------------------------
+project "sdl_rickroll"
+	kind "WindowedApp"
+	targetname "sdl_rickroll"
+
+	files { "examples/sdlrickroll.cpp", "examples/sdl_helper.hpp", "examples/rickroll_example.hpp" }
+
+	includedirs { "include" }
+	links { "guisan" }
+
+	debugdir "examples"
+
+-- ----------------------------------------------------------------------------
+project "sdl_widgets"
+	kind "WindowedApp"
+	targetname "sdl_widgets"
+
+	files { "examples/sdlwidgets.cpp", "examples/sdl_helper.hpp", "examples/widgets_example.hpp" }
+
+	includedirs { "include" }
+	links { "guisan" }
+
+	debugdir "examples"
+
+-- ----------------------------------------------------------------------------
+project "sdl2_widgets"
+	kind "WindowedApp"
+	targetname "sdl2_widgets"
+
+	files { "examples/sdl2widgets.cpp", "examples/sdl2_helper.hpp", "examples/widgets_example.hpp" }
+
+	includedirs { "include" }
+	links { "guisan" }
+
+	debugdir "examples"
+
+-- ----------------------------------------------------------------------------
+group "Demo"
+-- ----------------------------------------------------------------------------
+project "Demo_ff"
+	kind "WindowedApp"
+	targetname "Demo"
+
+	files { "Demo/ff/**.*" }
+	includedirs { "Demo/ff/include" }
+
+	includedirs { "include" }
+	links { "guisan" }
+
+	links {"opengl32"}
+
+	debugdir "Demo/ff"

From 2f197dfae5cbb8ba57a44ea1c2f92198e78e7661 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Wed, 25 Sep 2024 21:14:59 +0200
Subject: [PATCH 09/19] [example] Add ToggleButton. Also move slider to be
 visible

---
 examples/widgets_example.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/widgets_example.hpp b/examples/widgets_example.hpp
index 1dd4bb8..1897aa0 100644
--- a/examples/widgets_example.hpp
+++ b/examples/widgets_example.hpp
@@ -87,6 +87,8 @@ namespace WidgetsExample
             checkBox1 = std::make_unique<gcn::CheckBox>("Checkbox 1");
             checkBox2 = std::make_unique<gcn::CheckBox>("Checkbox 2");
 
+            toggleButton = std::make_unique<gcn::ToggleButton>("Toggle button");
+
             radioButton1 = std::make_unique<gcn::RadioButton>("Radio Button 1", "radiogroup", true);
             radioButton2 = std::make_unique<gcn::RadioButton>("Radio Button 2", "radiogroup");
             radioButton3 = std::make_unique<gcn::RadioButton>("Radio Button 3", "radiogroup");
@@ -138,10 +140,11 @@ namespace WidgetsExample
             top->add(dropDown.get(), 580, 10);
             top->add(checkBox1.get(), 580, 50);
             top->add(checkBox2.get(), 580, 70);
+            top->add(toggleButton.get(), 580, 90);
             top->add(radioButton1.get(), 580, 120);
             top->add(radioButton2.get(), 580, 140);
             top->add(radioButton3.get(), 580, 160);
-            top->add(slider.get(), 580, 200);
+            top->add(slider.get(), 580, 180);
             top->add(window.get(), 100, 350);
             top->add(nestedScrollArea.get(), 440, 350);
 
@@ -206,6 +209,7 @@ namespace WidgetsExample
         std::unique_ptr<gcn::RadioButton> radioButton1; // Three radio buttons
         std::unique_ptr<gcn::RadioButton> radioButton2;
         std::unique_ptr<gcn::RadioButton> radioButton3;
+        std::unique_ptr<gcn::ToggleButton> toggleButton;
         std::unique_ptr<gcn::Slider> slider; // A slider
         std::unique_ptr<gcn::Image> image; // An image for the icon
         std::unique_ptr<gcn::Window> window;

From 5fd9bb061af49c6416495469a5e5e1fa0347c581 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:34:23 +0200
Subject: [PATCH 10/19] Restore `Button::mHasMouse` and set it on
 `mousePressed` (`mouseEntered` doesn't happen on button creation).

---
 src/widgets/button.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 521509c..3de9bec 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -198,13 +198,15 @@ namespace gcn
     {
         if (mMousePressed)
         {
-            return true;
+            return mHasMouse;
         }
         return mKeyPressed;
     }
 
     void Button::mousePressed(MouseEvent& mouseEvent)
     {
+        mHasMouse = gcn::Rectangle(0, 0, getWidth(), getHeight())
+                        .isContaining(mouseEvent.getX(), mouseEvent.getY());
         if (mouseEvent.isConsumed())
         {
             return;
@@ -229,7 +231,8 @@ namespace gcn
     void Button::mouseReleased(MouseEvent& mouseEvent)
     {
         if (mouseEvent.getButton() == MouseEvent::Left
-            && mMousePressed)
+            && mMousePressed
+            && mHasMouse)
         {
             mMousePressed = false;
             distributeActionEvent();

From cd9241f07fecd4c4f83295789c8048de2cd0e966 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:45:41 +0200
Subject: [PATCH 11/19] Move `distributeActionEvent` from
 `Button::mouseReleased` into `Button::mouseClicked`

---
 include/guisan/widgets/button.hpp       |  1 +
 include/guisan/widgets/togglebutton.hpp |  2 +-
 src/widgets/button.cpp                  | 13 +++++++------
 src/widgets/togglebutton.cpp            | 12 ++----------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/include/guisan/widgets/button.hpp b/include/guisan/widgets/button.hpp
index 3d076d7..cb4b31e 100644
--- a/include/guisan/widgets/button.hpp
+++ b/include/guisan/widgets/button.hpp
@@ -156,6 +156,7 @@ namespace gcn
 
         void mousePressed(MouseEvent& mouseEvent) override;
         void mouseReleased(MouseEvent& mouseEvent) override;
+        void mouseClicked(MouseEvent& mouseEvent) override;
         void mouseEntered(MouseEvent& mouseEvent) override;
         void mouseExited(MouseEvent& mouseEvent) override;
         void mouseDragged(MouseEvent& mouseEvent) override;
diff --git a/include/guisan/widgets/togglebutton.hpp b/include/guisan/widgets/togglebutton.hpp
index d85ae2f..3c0d876 100644
--- a/include/guisan/widgets/togglebutton.hpp
+++ b/include/guisan/widgets/togglebutton.hpp
@@ -112,7 +112,7 @@ namespace gcn
 
         // Inherited from MouseListener
 
-        void mouseReleased(MouseEvent& mouseEvent) override;
+        void mouseClicked(MouseEvent& mouseEvent) override;
 
         // Inherited from KeyListener
 
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 3de9bec..519de16 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -230,17 +230,18 @@ namespace gcn
 
     void Button::mouseReleased(MouseEvent& mouseEvent)
     {
-        if (mouseEvent.getButton() == MouseEvent::Left
-            && mMousePressed
-            && mHasMouse)
+        if (mouseEvent.getButton() == MouseEvent::Left)
         {
             mMousePressed = false;
-            distributeActionEvent();
             mouseEvent.consume();
         }
-        else if (mouseEvent.getButton() == MouseEvent::Left)
+    }
+
+    void Button::mouseClicked(MouseEvent& mouseEvent)
+    {
+        if (mouseEvent.getButton() == MouseEvent::Left)
         {
-            mMousePressed = false;
+            distributeActionEvent();
             mouseEvent.consume();
         }
     }
diff --git a/src/widgets/togglebutton.cpp b/src/widgets/togglebutton.cpp
index 59e2894..a8f5a48 100644
--- a/src/widgets/togglebutton.cpp
+++ b/src/widgets/togglebutton.cpp
@@ -158,22 +158,14 @@ namespace gcn
         mSelected = selected;
     }
 
-    void ToggleButton::mouseReleased(MouseEvent& mouseEvent)
+    void ToggleButton::mouseClicked(MouseEvent& mouseEvent)
     {
-        if (mouseEvent.getButton() == MouseEvent::Left
-            && mMousePressed
-            && mHasMouse)
+        if (mouseEvent.getButton() == MouseEvent::Left)
         {
-            mMousePressed = false;
             toggleSelected();
             distributeActionEvent();
             mouseEvent.consume();
         }
-        else if (mouseEvent.getButton() == MouseEvent::Left)
-        {
-            mMousePressed = false;
-            mouseEvent.consume();
-        }
     }
 
     void ToggleButton::keyReleased(KeyEvent& keyEvent)

From 0c9536bad7ebcd226e45074c343c0e917909fb83 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Fri, 27 Sep 2024 23:32:10 +0200
Subject: [PATCH 12/19] Fix handling of `Button`s of `messagebox` and
 `inputbox`: Use `actionListener` instead of `mouseListener` so activate
 button with keyboard also works.

---
 include/guisan/widgets/inputbox.hpp   |  6 +++---
 include/guisan/widgets/messagebox.hpp |  7 ++++---
 src/widgets/inputbox.cpp              | 12 +++++-------
 src/widgets/messagebox.cpp            | 22 +++++++---------------
 4 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/include/guisan/widgets/inputbox.hpp b/include/guisan/widgets/inputbox.hpp
index 0fb7c32..763b224 100644
--- a/include/guisan/widgets/inputbox.hpp
+++ b/include/guisan/widgets/inputbox.hpp
@@ -74,7 +74,7 @@ namespace gcn
     /**
      * A non-movable window to get a short string from the user.
      */
-    class GCN_CORE_DECLSPEC InputBox : public Window
+    class GCN_CORE_DECLSPEC InputBox : public Window, public ActionListener
     {
     public:
 
@@ -118,9 +118,9 @@ namespace gcn
          */
         int getClickedButton() const;
 
-        // Inherited from MouseListener
+        // Inherited from ActionListener
 
-        void mouseReleased(MouseEvent& mouseEvent) override;
+        void action(const ActionEvent& actionEvent) override;
 
     protected:
         int mClickedButton = -1;
diff --git a/include/guisan/widgets/messagebox.hpp b/include/guisan/widgets/messagebox.hpp
index 26cff60..fc56937 100644
--- a/include/guisan/widgets/messagebox.hpp
+++ b/include/guisan/widgets/messagebox.hpp
@@ -57,6 +57,7 @@
 #ifndef GCN_MESSAGEBOX_HPP
 #define GCN_MESSAGEBOX_HPP
 
+#include "guisan/actionlistener.hpp"
 #include "guisan/platform.hpp"
 #include "guisan/widgets/button.hpp"
 #include "guisan/widgets/label.hpp"
@@ -71,7 +72,7 @@ namespace gcn
     /**
      * A non-movable window to display a message with some buttons.
      */
-    class GCN_CORE_DECLSPEC MessageBox : public Window
+    class GCN_CORE_DECLSPEC MessageBox : public Window, public ActionListener
     {
     public:
         /**
@@ -142,9 +143,9 @@ namespace gcn
          */
         void addToContainer(Container* container);
 
-        // Inherited from MouseListener
+        // Inherited from ActionListener
 
-        void mouseReleased(MouseEvent& mouseEvent) override;
+        void action(const ActionEvent& keyEvent) override;
 
     protected:
         Graphics::Alignment mButtonAlignment = Graphics::Alignment::Left;
diff --git a/src/widgets/inputbox.cpp b/src/widgets/inputbox.cpp
index 9470a8e..1ac9b96 100644
--- a/src/widgets/inputbox.cpp
+++ b/src/widgets/inputbox.cpp
@@ -74,7 +74,6 @@ namespace gcn
                        const std::string& cancel) :
         Window(caption)
     {
-        addMouseListener(this);
         setMovable(false);
 
         mLabel = std::make_unique<Label>(message);
@@ -85,12 +84,12 @@ namespace gcn
 
         mButtonOK = std::make_unique<Button>(ok);
         mButtonOK->setAlignment(Graphics::Center);
-        mButtonOK->addMouseListener(this);
+        mButtonOK->addActionListener(this);
         mButtonOK->adjustSize();
 
         mButtonCancel = std::make_unique<Button>(cancel);
         mButtonCancel->setAlignment(Graphics::Center);
-        mButtonCancel->addMouseListener(this);
+        mButtonCancel->addActionListener(this);
         mButtonCancel->adjustSize();
 
         // Look-and-feel: make both buttons the same width
@@ -136,20 +135,19 @@ namespace gcn
         releaseModalFocus();
     }
 
-    void InputBox::mouseReleased(MouseEvent& mouseEvent)
+    void InputBox::action(const ActionEvent& actionEvent)
     {
-        if (mouseEvent.getSource() == mButtonOK.get())
+        if (actionEvent.getSource() == mButtonOK.get())
         {
             mClickedButton = 0;
             distributeActionEvent();
         }
-        else if (mouseEvent.getSource() == mButtonCancel.get())
+        else if (actionEvent.getSource() == mButtonCancel.get())
         {
             mClickedButton = 1;
             setVisible(false);
             distributeActionEvent();
         }
-        Window::mouseReleased(mouseEvent);
     }
 
     int InputBox::getClickedButton() const
diff --git a/src/widgets/messagebox.cpp b/src/widgets/messagebox.cpp
index 0c147d0..bc5b19b 100644
--- a/src/widgets/messagebox.cpp
+++ b/src/widgets/messagebox.cpp
@@ -86,7 +86,6 @@ namespace gcn
                            int size) :
         Window(caption)
     {
-        addMouseListener(this);
         setMovable(false);
 
         mLabel = std::make_unique<Label>(message);
@@ -102,7 +101,7 @@ namespace gcn
             mButtons.emplace_back(std::make_unique<Button>(button_captions[i]));
             auto& button = mButtons.back();
             button->setAlignment(Graphics::Center);
-            button->addMouseListener(this);
+            button->addActionListener(this);
             maxButtonWidth = std::max(maxButtonWidth, button->getWidth());
             maxButtonHeight = std::max(maxButtonHeight, button->getHeight());
         }
@@ -184,24 +183,17 @@ namespace gcn
         return mButtonAlignment;
     }
 
-    void MessageBox::mouseReleased(MouseEvent& mouseEvent)
+    void MessageBox::action(const ActionEvent& actionEvent)
     {
-        if (mouseEvent.getSource() != this)
+        for (std::size_t i = 0; i != mButtons.size(); ++i)
         {
-            for (std::size_t i = 0; i != mButtons.size(); ++i)
+            if (actionEvent.getSource() == mButtons[i].get())
             {
-                if (mouseEvent.getSource() == mButtons[i].get())
-                {
-                    mClickedButton = static_cast<int>(i);
-                    distributeActionEvent();
-                    break;
-                }
+                mClickedButton = static_cast<int>(i);
+                distributeActionEvent();
+                break;
             }
         }
-        else
-        {
-            Window::mouseReleased(mouseEvent);
-        }
     }
 
     int MessageBox::getClickedButton() const

From e3cb1e71f0687d7dab2135f3c8fce77f7b7c053e Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Sat, 28 Sep 2024 14:06:56 +0200
Subject: [PATCH 13/19] [example] Add imageButton

---
 examples/widgets_example.hpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/examples/widgets_example.hpp b/examples/widgets_example.hpp
index 1897aa0..5bfb458 100644
--- a/examples/widgets_example.hpp
+++ b/examples/widgets_example.hpp
@@ -1,4 +1,6 @@
 #include <guisan.hpp>
+
+#include <algorithm>
 #include <memory>
 
 namespace WidgetsExample
@@ -56,6 +58,11 @@ namespace WidgetsExample
 
             button->addActionListener(this);
 
+            imageButton = std::make_unique<gcn::ImageButton>("guisan-logo.png");
+
+            imageButton->setSize(220, 90);
+            imageButton->addActionListener(this);
+
             inputBox = std::make_unique<gcn::InputBox>("Change name", " Set name of label ");
 
             inputBox->setVisible(false);
@@ -133,6 +140,7 @@ namespace WidgetsExample
             top->add(label.get(), 290, 10);
             top->add(icon.get(), 10, 10);
             top->add(button.get(), 325, 10);
+            top->add(imageButton.get(), 10, 290);
             top->add(textField.get(), 375, 10);
             top->add(textBoxScrollArea.get(), 290, 50);
             top->add(inputBox.get(), 270, 180);
@@ -162,6 +170,15 @@ namespace WidgetsExample
                 inputBox->setVisible(true);
                 top->moveToTop(inputBox.get());
             }
+            else if (actionEvent.getSource() == imageButton.get())
+            {
+                const gcn::Color colours[] = {gcn::Color(212, 255, 150, 190),
+                                              gcn::Color(212, 0, 0, 190),
+                                              gcn::Color(0, 0, 150, 190)};
+                const auto it = std::find(std::begin(colours), std::end(colours), window->getBaseColor());
+                window->setBaseColor(
+                    colours[(std::distance(std::begin(colours), it) + 1) % std::size(colours)]);
+            }
             else if (actionEvent.getSource() == inputBox.get())
             {
                 inputBox->setVisible(false);
@@ -198,6 +215,7 @@ namespace WidgetsExample
         std::unique_ptr<gcn::Label> label; // A label
         std::unique_ptr<gcn::Icon> icon; // An icon (image)
         std::unique_ptr<gcn::Button> button; // A button
+        std::unique_ptr<gcn::ImageButton> imageButton; // An image button
         std::unique_ptr<gcn::InputBox> inputBox; // An input box
         std::unique_ptr<gcn::TextField> textField; // One-line text field
         std::unique_ptr<gcn::TextBox> textBox; // Multi-line text box

From 9565056e6e10c7db97ff842ef1db50a340d7b10e Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Sat, 28 Sep 2024 22:39:02 +0200
Subject: [PATCH 14/19] [example] Add `ImageTextButton` in widgets_example Fix
 `ImageTextButton`

---
 examples/widgets_example.hpp               | 12 ++++++++++-
 include/guisan/widgets/imagetextbutton.hpp | 24 +---------------------
 src/widgets/imagetextbutton.cpp            | 19 -----------------
 3 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/examples/widgets_example.hpp b/examples/widgets_example.hpp
index 5bfb458..ab91954 100644
--- a/examples/widgets_example.hpp
+++ b/examples/widgets_example.hpp
@@ -63,6 +63,13 @@ namespace WidgetsExample
             imageButton->setSize(220, 90);
             imageButton->addActionListener(this);
 
+            imageTextButton = std::make_unique<gcn::ImageTextButton>("guisan-logo.png", "Change color");
+            imageTextButton->setSize(220, 100);
+            imageTextButton->setAlignment(gcn::ImageTextButton::TOP);
+            imageTextButton->addActionListener(this);
+
+            imageButton->setSize(220, 90);
+            imageButton->addActionListener(this);
             inputBox = std::make_unique<gcn::InputBox>("Change name", " Set name of label ");
 
             inputBox->setVisible(false);
@@ -141,6 +148,7 @@ namespace WidgetsExample
             top->add(icon.get(), 10, 10);
             top->add(button.get(), 325, 10);
             top->add(imageButton.get(), 10, 290);
+            top->add(imageTextButton.get(), 10, 380);
             top->add(textField.get(), 375, 10);
             top->add(textBoxScrollArea.get(), 290, 50);
             top->add(inputBox.get(), 270, 180);
@@ -170,7 +178,8 @@ namespace WidgetsExample
                 inputBox->setVisible(true);
                 top->moveToTop(inputBox.get());
             }
-            else if (actionEvent.getSource() == imageButton.get())
+            else if (actionEvent.getSource() == imageButton.get()
+                     || actionEvent.getSource() == imageTextButton.get())
             {
                 const gcn::Color colours[] = {gcn::Color(212, 255, 150, 190),
                                               gcn::Color(212, 0, 0, 190),
@@ -216,6 +225,7 @@ namespace WidgetsExample
         std::unique_ptr<gcn::Icon> icon; // An icon (image)
         std::unique_ptr<gcn::Button> button; // A button
         std::unique_ptr<gcn::ImageButton> imageButton; // An image button
+        std::unique_ptr<gcn::ImageTextButton> imageTextButton; // An image text button
         std::unique_ptr<gcn::InputBox> inputBox; // An input box
         std::unique_ptr<gcn::TextField> textField; // One-line text field
         std::unique_ptr<gcn::TextBox> textBox; // Multi-line text box
diff --git a/include/guisan/widgets/imagetextbutton.hpp b/include/guisan/widgets/imagetextbutton.hpp
index 67481eb..96e9933 100644
--- a/include/guisan/widgets/imagetextbutton.hpp
+++ b/include/guisan/widgets/imagetextbutton.hpp
@@ -91,27 +91,13 @@ namespace gcn
         /**
          * Destructor.
          */
-        ~ImageTextButton() override;
+        ~ImageTextButton() override = default;
 
         /**
          * Adjusts the size of the image button to fit the image.
          */
         void adjustSize();
 
-        /**
-         * Sets the image to display.
-         *
-         * @param image The image to display.
-         */
-        void setImage(Image* image);
-
-        /**
-         * Gets the image of the image button.
-         *
-         * @return The image of the image button.
-         */
-        Image* getImage();
-
         // Inherited from Widget
 
         void draw(gcn::Graphics* graphics) override;
@@ -141,14 +127,6 @@ namespace gcn
         };
 
     protected:
-        gcn::Image* mImage = nullptr;
-
-        /**
-         * True if the image has been loaded internally, false otherwise.
-         * An image not loaded internally should not be deleted in the
-         * destructor.
-         */
-        bool mInternalImage = false;
         unsigned int mAlignment = ImageTextButton::BOTTOM;
     };
 }
diff --git a/src/widgets/imagetextbutton.cpp b/src/widgets/imagetextbutton.cpp
index dffce97..0fabaed 100644
--- a/src/widgets/imagetextbutton.cpp
+++ b/src/widgets/imagetextbutton.cpp
@@ -81,12 +81,6 @@ namespace gcn
         setHeight(mImage->getHeight() + mImage->getHeight() / 2);
     }
 
-    ImageTextButton::~ImageTextButton()
-    {
-        if (mInternalImage)
-            delete mImage;
-    }
-    
     void ImageTextButton::adjustSize()
     {
         switch(getAlignment())
@@ -113,19 +107,6 @@ namespace gcn
         }
     }
 
-    void ImageTextButton::setImage(Image* image)
-    {
-        if (mInternalImage)
-            delete mImage;
-        mImage = image;
-        mInternalImage = false;
-    }
-
-    Image* ImageTextButton::getImage()
-    {
-        return mImage;
-    }
-
     void ImageTextButton::draw(Graphics* graphics)
     {
         gcn::Color faceColor = getBaseColor();

From 9c680cfa536483dde84bf1e76eab1a64e7cb3423 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:26:10 +0200
Subject: [PATCH 15/19] Apply patch from Stratagus to handle hotkey

---
 include/guisan/focushandler.hpp   |  6 ++++++
 include/guisan/keylistener.hpp    |  3 +++
 include/guisan/widget.hpp         | 22 ++++++++++++++++++++
 include/guisan/widgets/button.hpp |  4 ++++
 src/focushandler.cpp              | 34 +++++++++++++++++++++++++++++++
 src/gui.cpp                       |  5 +++++
 src/widgets/button.cpp            | 18 +++++++++++++++-
 7 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/include/guisan/focushandler.hpp b/include/guisan/focushandler.hpp
index 77cf1a9..2775383 100644
--- a/include/guisan/focushandler.hpp
+++ b/include/guisan/focushandler.hpp
@@ -64,6 +64,7 @@
 
 namespace gcn
 {
+    class KeyInput;
     class Widget;
 
     /**
@@ -329,6 +330,11 @@ namespace gcn
          */
         virtual void setLastWidgetPressed(Widget* lastWidgetPressed);
 
+        /**
+        * 
+        * @param keyInput
+        */
+        void checkHotKey(const KeyInput& keyInput);
     protected:
         /**
          * Distributes a focus lost event.
diff --git a/include/guisan/keylistener.hpp b/include/guisan/keylistener.hpp
index f54491c..c6307db 100644
--- a/include/guisan/keylistener.hpp
+++ b/include/guisan/keylistener.hpp
@@ -94,6 +94,9 @@ namespace gcn
          */
         virtual void keyReleased(KeyEvent& keyEvent) { }
 
+        virtual void hotKeyPressed(const Key&) {}
+        virtual void hotKeyReleased(const Key&) {}
+
     protected:
         /**
          * Constructor.
diff --git a/include/guisan/widget.hpp b/include/guisan/widget.hpp
index dd3fce1..c5103b1 100644
--- a/include/guisan/widget.hpp
+++ b/include/guisan/widget.hpp
@@ -1040,6 +1040,26 @@ namespace gcn
          */
         virtual void showPart(Rectangle rectangle);
 
+        /**
+         * Called when a Widget's hot key is pressed
+         */
+        virtual void hotKeyPressed() {}
+
+        /**
+         * Called when a Widget's hot key is released
+         */
+        virtual void hotKeyReleased() {}
+
+        /**
+         * Get the hot key
+         */
+        int getHotKey() const { return mHotKey; }
+
+        /**
+         * Set the hot key
+         */
+        void setHotKey(const int key) { mHotKey = key; }
+
     protected:
         /**
          * Distributes an action event to all action listeners
@@ -1262,6 +1282,8 @@ namespace gcn
          */
         std::list<Widget*> mChildren;
 
+        int mHotKey = 0;
+
         /**
          * Holds the default font used by the widget.
          */
diff --git a/include/guisan/widgets/button.hpp b/include/guisan/widgets/button.hpp
index cb4b31e..cf7d0ae 100644
--- a/include/guisan/widgets/button.hpp
+++ b/include/guisan/widgets/button.hpp
@@ -147,6 +147,8 @@ namespace gcn
         //Inherited from Widget
 
         void draw(Graphics* graphics) override;
+        void hotKeyPressed() override;
+        void hotKeyReleased() override;
 
         // Inherited from FocusListener
 
@@ -195,6 +197,8 @@ namespace gcn
          */
         bool mMousePressed = false;
 
+        bool mHotKeyPressed = false;
+
         /**
          * Holds the alignment of the caption.
          */
diff --git a/src/focushandler.cpp b/src/focushandler.cpp
index f0adafb..8d0270a 100644
--- a/src/focushandler.cpp
+++ b/src/focushandler.cpp
@@ -62,6 +62,7 @@
 
 #include "guisan/focuslistener.hpp"
 #include "guisan/exception.hpp"
+#include "guisan/keyinput.hpp"
 #include "guisan/widget.hpp"
 
 namespace gcn
@@ -582,4 +583,37 @@ namespace gcn
     {
         mLastWidgetPressed = lastWidgetPressed;
     }
+
+    void FocusHandler::checkHotKey(const KeyInput& keyInput)
+    {
+        const int keyin = keyInput.getKey().getValue();
+
+        for (auto widget : mWidgets)
+        {
+            int hotKey = widget->getHotKey();
+
+            if (hotKey == 0)
+            {
+                continue;
+            }
+            hotKey = isascii(hotKey) ? tolower(hotKey) : hotKey;
+
+            if ((isascii(keyin) && tolower(keyin) == hotKey) || keyin == hotKey)
+            {
+                if (keyInput.getType() == KeyInput::Pressed)
+                {
+                    widget->hotKeyPressed();
+                    if (widget->isFocusable())
+                    {
+                        this->requestFocus(widget);
+                    }
+                }
+                else
+                {
+                    widget->hotKeyReleased();
+                }
+                break;
+            }
+        }
+    }
 }
diff --git a/src/gui.cpp b/src/gui.cpp
index 2edf3a0..4c2700c 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -278,6 +278,11 @@ namespace gcn
                 keyEventConsumed = keyEvent.isConsumed();
             }
 
+            if (!keyEventConsumed)
+            {
+                mFocusHandler->checkHotKey(keyInput);
+            }
+
             // If the key event hasn't been consumed and
             // tabbing is enable check for tab press and
             // change focus.
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 519de16..6ce2d21 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -200,7 +200,7 @@ namespace gcn
         {
             return mHasMouse;
         }
-        return mKeyPressed;
+        return mKeyPressed || mHotKeyPressed;
     }
 
     void Button::mousePressed(MouseEvent& mouseEvent)
@@ -261,6 +261,7 @@ namespace gcn
             mKeyPressed = true;
             keyEvent.consume();
         }
+        mHotKeyPressed = false;
     }
 
     void Button::keyReleased(KeyEvent& keyEvent)
@@ -277,6 +278,21 @@ namespace gcn
         }
     }
 
+    void Button::hotKeyPressed()
+    {
+        mHotKeyPressed = true;
+        mMousePressed = false;
+    }
+
+    void Button::hotKeyReleased()
+    {
+        if (mHotKeyPressed)
+        {
+            mHotKeyPressed = false;
+            distributeActionEvent();
+        }
+    }
+
     void Button::focusLost(const Event& event)
     {
         mMousePressed = false;

From 9145fdb61d72281a0e785e4069873ed385087911 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:54:36 +0200
Subject: [PATCH 16/19] [example] Add hotkey for buttons of example.

---
 examples/widgets_example.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/widgets_example.hpp b/examples/widgets_example.hpp
index ab91954..9762663 100644
--- a/examples/widgets_example.hpp
+++ b/examples/widgets_example.hpp
@@ -56,11 +56,13 @@ namespace WidgetsExample
 
             button = std::make_unique<gcn::Button>("Button");
 
+            button->setHotKey('b');
             button->addActionListener(this);
 
             imageButton = std::make_unique<gcn::ImageButton>("guisan-logo.png");
 
             imageButton->setSize(220, 90);
+            imageButton->setHotKey('g');
             imageButton->addActionListener(this);
 
             imageTextButton = std::make_unique<gcn::ImageTextButton>("guisan-logo.png", "Change color");

From 432e713cacd8defab596a83c70d9966fdee664a9 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Sun, 29 Sep 2024 23:58:56 +0200
Subject: [PATCH 17/19] [example] Fix typo, remove duplicated code

---
 examples/widgets_example.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/examples/widgets_example.hpp b/examples/widgets_example.hpp
index ab91954..6dbc031 100644
--- a/examples/widgets_example.hpp
+++ b/examples/widgets_example.hpp
@@ -68,8 +68,6 @@ namespace WidgetsExample
             imageTextButton->setAlignment(gcn::ImageTextButton::TOP);
             imageTextButton->addActionListener(this);
 
-            imageButton->setSize(220, 90);
-            imageButton->addActionListener(this);
             inputBox = std::make_unique<gcn::InputBox>("Change name", " Set name of label ");
 
             inputBox->setVisible(false);

From 99f4d0dd8408e46a163e39b8fe5dd5d9a32af8eb Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Mon, 30 Sep 2024 11:06:56 +0200
Subject: [PATCH 18/19] [cleanup] use for-range and algorithm instead of manual
 usage of iterators

---
 src/focushandler.cpp        |  29 ++---
 src/gui.cpp                 | 113 ++++++-------------
 src/widget.cpp              | 216 ++++++++++++------------------------
 src/widgets/container.cpp   |  14 +--
 src/widgets/dropdown.cpp    |   7 +-
 src/widgets/listbox.cpp     |   7 +-
 src/widgets/radiobutton.cpp |  14 +--
 src/widgets/tabbedarea.cpp  |   6 +-
 8 files changed, 130 insertions(+), 276 deletions(-)

diff --git a/src/focushandler.cpp b/src/focushandler.cpp
index 8d0270a..d26da65 100644
--- a/src/focushandler.cpp
+++ b/src/focushandler.cpp
@@ -65,6 +65,8 @@
 #include "guisan/keyinput.hpp"
 #include "guisan/widget.hpp"
 
+#include <algorithm>
+
 namespace gcn
 {
 
@@ -296,15 +298,10 @@ namespace gcn
             mFocusedWidget = nullptr;
         }
 
-        WidgetIterator iter;
-
-        for (iter = mWidgets.begin(); iter != mWidgets.end(); ++iter)
+        const auto iter = std::find(mWidgets.begin(), mWidgets.end(), widget);
+        if (iter != mWidgets.end())
         {
-            if ((*iter) == widget)
-            {
-                mWidgets.erase(iter);
-                break;
-            }
+            mWidgets.erase(iter);
         }
 
         if (mDraggedWidget == widget)
@@ -508,14 +505,10 @@ namespace gcn
     {
         Widget* sourceWidget = focusEvent.getSource();
 
-        std::list<FocusListener*> focusListeners = sourceWidget->_getFocusListeners();
-
         // Send the event to all focus listeners of the widget.
-        for (std::list<FocusListener*>::iterator it = focusListeners.begin();
-             it != focusListeners.end();
-             ++it)
+        for (auto* focusListener : sourceWidget->_getFocusListeners())
         {
-            (*it)->focusLost(focusEvent);
+            focusListener->focusLost(focusEvent);
         }
     }
 
@@ -523,14 +516,10 @@ namespace gcn
     {
         Widget* sourceWidget = focusEvent.getSource();
 
-        std::list<FocusListener*> focusListeners = sourceWidget->_getFocusListeners();
-
         // Send the event to all focus listeners of the widget.
-        for (std::list<FocusListener*>::iterator it = focusListeners.begin();
-             it != focusListeners.end();
-             ++it)
+        for (auto* focusListener : sourceWidget->_getFocusListeners())
         {
-            (*it)->focusGained(focusEvent);
+            focusListener->focusGained(focusEvent);
         }
     }
 
diff --git a/src/gui.cpp b/src/gui.cpp
index 4c2700c..a2e8f91 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -313,10 +313,9 @@ namespace gcn
         if (mouseInput.getX() < 0 || mouseInput.getY() < 0
             || !mTop->getDimension().isContaining(mouseInput.getX(), mouseInput.getY()))
         {
-            std::set<Widget*>::const_iterator iter;
-            for (iter = mLastWidgetsWithMouse.begin(); iter != mLastWidgetsWithMouse.end(); iter++)
+            for (Widget* w : mLastWidgetsWithMouse)
             {
-                distributeMouseEvent((*iter),
+                distributeMouseEvent(w,
                                      MouseEvent::Exited,
                                      mouseInput.getButton(),
                                      mouseInput.getX(),
@@ -348,11 +347,9 @@ namespace gcn
                 mLastWidgetsWithMouse.end(),
                 std::inserter(mWidgetsWithMouseEntered, mWidgetsWithMouseEntered.begin()));
 
-            std::set<Widget*>::const_iterator iter;
-            for (iter = mWidgetsWithMouseExited.begin(); iter != mWidgetsWithMouseExited.end();
-                 iter++)
+            for (Widget* w : mWidgetsWithMouseExited)
             {
-                distributeMouseEvent((*iter),
+                distributeMouseEvent(w,
                                      MouseEvent::Exited,
                                      mouseInput.getButton(),
                                      mouseInput.getX(),
@@ -366,10 +363,8 @@ namespace gcn
                 mLastMousePressTimeStamp = 0;
             }
 
-            for (iter = mWidgetsWithMouseEntered.begin(); iter != mWidgetsWithMouseEntered.end();
-                 iter++)
+            for (Widget* widget : mWidgetsWithMouseEntered)
             {
-                Widget* widget = (*iter);
                 // If a widget has modal mouse input focus we
                 // only want to send entered events to that widget
                 // and the widget's parents.
@@ -650,44 +645,26 @@ namespace gcn
                 mouseEvent.mX = x - widgetX;
                 mouseEvent.mY = y - widgetY;
                 mouseEvent.mDistributor = widget;
-                std::list<MouseListener*> mouseListeners = widget->_getMouseListeners();
 
                 // Send the event to all mouse listeners of the widget.
-                for (std::list<MouseListener*>::iterator it = mouseListeners.begin();
-                     it != mouseListeners.end();
-                     ++it)
+                for (MouseListener* mouseListener : widget->_getMouseListeners())
                 {
                     switch (mouseEvent.getType())
                     {
-                      case MouseEvent::Entered:
-                          (*it)->mouseEntered(mouseEvent);
-                          break;
-                      case MouseEvent::Exited:
-                          (*it)->mouseExited(mouseEvent);
-                          break;
-                      case MouseEvent::Moved:
-                          (*it)->mouseMoved(mouseEvent);
-                          break;
-                      case MouseEvent::Pressed:
-                          (*it)->mousePressed(mouseEvent);
-                          break;
-                      case MouseEvent::Released:
-                          (*it)->mouseReleased(mouseEvent);
-                          break;
-                      case MouseEvent::WheelMovedUp:
-                          (*it)->mouseWheelMovedUp(mouseEvent);
-                          break;
-                      case MouseEvent::WheelMovedDown:
-                          (*it)->mouseWheelMovedDown(mouseEvent);
-                          break;
-                      case MouseEvent::Dragged:
-                          (*it)->mouseDragged(mouseEvent);
-                          break;
-                      case MouseEvent::Clicked:
-                          (*it)->mouseClicked(mouseEvent);
-                          break;
-                      default:
-                          throw GCN_EXCEPTION("Unknown mouse event type.");
+                        case MouseEvent::Entered: mouseListener->mouseEntered(mouseEvent); break;
+                        case MouseEvent::Exited: mouseListener->mouseExited(mouseEvent); break;
+                        case MouseEvent::Moved: mouseListener->mouseMoved(mouseEvent); break;
+                        case MouseEvent::Pressed: mouseListener->mousePressed(mouseEvent); break;
+                        case MouseEvent::Released: mouseListener->mouseReleased(mouseEvent); break;
+                        case MouseEvent::WheelMovedUp:
+                            mouseListener->mouseWheelMovedUp(mouseEvent);
+                            break;
+                        case MouseEvent::WheelMovedDown:
+                            mouseListener->mouseWheelMovedDown(mouseEvent);
+                            break;
+                        case MouseEvent::Dragged: mouseListener->mouseDragged(mouseEvent); break;
+                        case MouseEvent::Clicked: mouseListener->mouseClicked(mouseEvent); break;
+                        default: throw GCN_EXCEPTION("Unknown mouse event type.");
                     }
                 }
 
@@ -752,23 +729,15 @@ namespace gcn
             if (widget->isEnabled())
             {
                 keyEvent.mDistributor = widget;
-                std::list<KeyListener*> keyListeners = widget->_getKeyListeners();
 
                 // Send the event to all key listeners of the source widget.
-                for (std::list<KeyListener*>::iterator it = keyListeners.begin();
-                     it != keyListeners.end();
-                     ++it)
+                for (KeyListener* keyListener : widget->_getKeyListeners())
                 {
                     switch (keyEvent.getType())
                     {
-                      case KeyEvent::Pressed:
-                          (*it)->keyPressed(keyEvent);
-                          break;
-                      case KeyEvent::Released:
-                          (*it)->keyReleased(keyEvent);
-                          break;
-                      default:
-                          throw GCN_EXCEPTION("Unknown key event type.");
+                        case KeyEvent::Pressed: keyListener->keyPressed(keyEvent); break;
+                        case KeyEvent::Released: keyListener->keyReleased(keyEvent); break;
+                        default: throw GCN_EXCEPTION("Unknown key event type.");
                     }
                 }
             }
@@ -789,20 +758,13 @@ namespace gcn
 
     void Gui::distributeKeyEventToGlobalKeyListeners(KeyEvent& keyEvent)
     {
-        KeyListenerListIterator it;
-
-        for (it = mKeyListeners.begin(); it != mKeyListeners.end(); it++)
+        for (KeyListener* keyListener : mKeyListeners)
         {
             switch (keyEvent.getType())
             {
-              case KeyEvent::Pressed:
-                  (*it)->keyPressed(keyEvent);
-                  break;
-              case KeyEvent::Released:
-                  (*it)->keyReleased(keyEvent);
-                  break;
-              default:
-                  throw GCN_EXCEPTION("Unknown key event type.");
+                case KeyEvent::Pressed: keyListener->keyPressed(keyEvent); break;
+                case KeyEvent::Released: keyListener->keyReleased(keyEvent); break;
+                default: throw GCN_EXCEPTION("Unknown key event type.");
             }
 
             if (keyEvent.isConsumed())
@@ -858,17 +820,10 @@ namespace gcn
         // and send them a mouse exited event.
         std::set<Widget*> mWidgetsWithMouse = getWidgetsAt(mLastMouseX, mLastMouseY);
 
-        for (std::set<Widget*>::const_iterator iter = mWidgetsWithMouse.begin();
-             iter != mWidgetsWithMouse.end();
-             iter++)
+        for (Widget* w : mWidgetsWithMouse)
         {
-            distributeMouseEvent((*iter),
-                                 MouseEvent::Exited,
-                                 mLastMousePressButton,
-                                 mLastMouseX,
-                                 mLastMouseY,
-                                 true,
-                                 true);
+            distributeMouseEvent(
+                w, MouseEvent::Exited, mLastMousePressButton, mLastMouseX, mLastMouseY, true, true);
         }
 
         mFocusHandler->setLastWidgetWithModalMouseInputFocus(mFocusHandler->getModalMouseInputFocused());
@@ -880,11 +835,9 @@ namespace gcn
         // and send them a mouse entered event.
         std::set<Widget*> mWidgetsWithMouse = getWidgetsAt(mLastMouseX, mLastMouseY);
 
-        for (std::set<Widget*>::const_iterator iter = mWidgetsWithMouse.begin();
-             iter != mWidgetsWithMouse.end();
-             ++iter)
+        for (Widget* w : mWidgetsWithMouse)
         {
-            distributeMouseEvent((*iter),
+            distributeMouseEvent(w,
                                  MouseEvent::Entered,
                                  mLastMousePressButton,
                                  mLastMouseX,
diff --git a/src/widget.cpp b/src/widget.cpp
index e322428..359fbc7 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -94,17 +94,15 @@ namespace gcn
             mParent->remove(this);
         }
 
-        std::list<Widget*>::const_iterator childrenIter;
-        for (childrenIter = mChildren.begin(); childrenIter != mChildren.end(); childrenIter++)
+        for (Widget* w : mChildren)
         {
-            (*childrenIter)->_setParent(nullptr);
+            w->_setParent(nullptr);
         }
 
-        std::list<DeathListener*>::const_iterator deathIter;
-        for (deathIter = mDeathListeners.begin(); deathIter != mDeathListeners.end(); ++deathIter)
+        for (DeathListener* deathListener : mDeathListeners)
         {
-            Event event(this);
-            (*deathIter)->death(event);
+            const Event event(this);
+            deathListener->death(event);
         }
 
         _setFocusHandler(nullptr);
@@ -395,12 +393,11 @@ namespace gcn
             return;
         }
 
-        std::list<Widget*>::const_iterator iter;
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        for (Widget* w : mChildren)
         {
-            if (widgetExists(*iter))
+            if (widgetExists(w))
             {
-                (*iter)->_setFocusHandler(focusHandler);
+                w->_setFocusHandler(focusHandler);
             }
         }
     }
@@ -507,12 +504,11 @@ namespace gcn
     {
         mGlobalFont = font;
 
-        std::list<Widget*>::iterator iter;
-        for (iter = mWidgetInstances.begin(); iter != mWidgetInstances.end(); ++iter)
+        for (Widget* w : mWidgetInstances)
         {
-            if ((*iter)->mCurrentFont == nullptr)
+            if (w->mCurrentFont == nullptr)
             {
-                (*iter)->fontChanged();
+                w->fontChanged();
             }
         }
     }
@@ -525,16 +521,7 @@ namespace gcn
 
     bool Widget::widgetExists(const Widget* widget)
     {
-        std::list<Widget*>::const_iterator iter;
-        for (iter = mWidgetInstances.begin(); iter != mWidgetInstances.end(); ++iter)
-        {
-            if (*iter == widget)
-            {
-                return true;
-            }
-        }
-
-        return false;
+        return std::find(mWidgetInstances.begin(), mWidgetInstances.end(), widget) != mWidgetInstances.end();
     }
 
     bool Widget::isTabInEnabled() const
@@ -698,16 +685,15 @@ namespace gcn
     {
         mInternalFocusHandler = focusHandler;
 
-        std::list<Widget*>::const_iterator iter;
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        for (Widget* w : mChildren)
         {
             if (mInternalFocusHandler == nullptr)
             {
-                (*iter)->_setFocusHandler(_getFocusHandler());
+                w->_setFocusHandler(_getFocusHandler());
             }
             else
             {
-                (*iter)->_setFocusHandler(mInternalFocusHandler);
+                w->_setFocusHandler(mInternalFocusHandler);
             }
         }
     }
@@ -724,55 +710,51 @@ namespace gcn
 
     void Widget::distributeResizedEvent()
     {
-        std::list<WidgetListener*>::const_iterator iter;
+        const Event event(this);
 
-        for (iter = mWidgetListeners.begin(); iter != mWidgetListeners.end(); ++iter)
+        for (WidgetListener* widgetListener : mWidgetListeners)
         {
-            Event event(this);
-            (*iter)->widgetResized(event);
+            widgetListener->widgetResized(event);
         }
     }
 
     void Widget::distributeMovedEvent()
     {
-        std::list<WidgetListener*>::const_iterator iter;
+        const Event event(this);
 
-        for (iter = mWidgetListeners.begin(); iter != mWidgetListeners.end(); ++iter)
+        for (WidgetListener* widgetListener : mWidgetListeners)
         {
-            Event event(this);
-            (*iter)->widgetMoved(event);
+            widgetListener->widgetMoved(event);
         }
     }
 
     void Widget::distributeHiddenEvent()
     {
-        std::list<WidgetListener*>::const_iterator iter;
+        const Event event(this);
 
-        for (iter = mWidgetListeners.begin(); iter != mWidgetListeners.end(); ++iter)
+        for (WidgetListener* widgetListener : mWidgetListeners)
         {
-            Event event(this);
-            (*iter)->widgetHidden(event);
+            widgetListener->widgetHidden(event);
         }
     }
 
     void Widget::distributeActionEvent()
     {
-        std::list<ActionListener*>::const_iterator iter;
-        for (iter = mActionListeners.begin(); iter != mActionListeners.end(); ++iter)
+        const ActionEvent actionEvent(this, mActionEventId);
+
+        for (ActionListener* actionListener : mActionListeners)
         {
-            ActionEvent actionEvent(this, mActionEventId);
-            (*iter)->action(actionEvent);
+            actionListener->action(actionEvent);
         }
     }
 
     void Widget::distributeShownEvent()
     {
-        std::list<WidgetListener*>::const_iterator iter;
+        const Event event(this);
 
-        for (iter = mWidgetListeners.begin(); iter != mWidgetListeners.end(); ++iter)
+        for (WidgetListener* widgetListener : mWidgetListeners)
         {
-            Event event(this);
-            (*iter)->widgetShown(event);
+            widgetListener->widgetShown(event);
         }
     }
 
@@ -804,10 +786,8 @@ namespace gcn
     {
         std::list<Widget*> result;
 
-        std::list<Widget*>::const_iterator iter;
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        for (Widget* widget : mChildren)
         {
-            Widget* widget = (*iter);
             if (ignore != widget && widget->getDimension().isIntersecting(area))
             {
                 result.push_back(widget);
@@ -819,20 +799,12 @@ namespace gcn
 
     void Widget::resizeToChildren()
     {
-        int w = 0, h = 0;
-        std::list<Widget*>::const_iterator iter;
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        int w = 0;
+        int h = 0;
+        for (Widget* widget : mChildren)
         {
-            Widget* widget = (*iter);
-            if (widget->getX() + widget->getWidth() > w)
-            {
-                w = widget->getX() + widget->getWidth();
-            }
-
-            if (widget->getY() + widget->getHeight() > h)
-            {
-                h = widget->getY() + widget->getHeight();
-            }
+            w = std::max(w, widget->getX() + widget->getWidth());
+            h = std::max(h, widget->getY() + widget->getHeight());
         }
 
         setSize(w, h);
@@ -840,24 +812,17 @@ namespace gcn
 
     Widget* Widget::findWidgetById(const std::string& id)
     {
-        std::list<Widget*>::const_iterator iter;
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        for (Widget* widget : mChildren)
         {
-            Widget* widget = (*iter);
-
             if (widget->getId() == id)
             {
                 return widget;
             }
-
-            Widget* child = widget->findWidgetById(id);
-
-            if (child != nullptr)
+            if (Widget* child = widget->findWidgetById(id))
             {
                 return child;
             }
         }
-
         return nullptr;
     }
 
@@ -891,32 +856,27 @@ namespace gcn
 
     void Widget::clear()
     {
-        std::list<Widget*>::const_iterator iter;
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        for (Widget* widget : mChildren)
         {
-            Widget* widget = (*iter);
             widget->_setFocusHandler(nullptr);
             widget->_setParent(nullptr);
         }
-
         mChildren.clear();
     }
 
     void Widget::remove(Widget* widget)
     {
-        std::list<Widget*>::iterator iter;
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        auto it = std::find(mChildren.begin(), mChildren.end(), widget);
+        if (it == mChildren.end())
         {
-            if (*iter == widget)
-            {
-                mChildren.erase(iter);
-                widget->_setFocusHandler(nullptr);
-                widget->_setParent(nullptr);
-                return;
-            }
+            throw GCN_EXCEPTION("There is no such widget in this container.");
+        }
+        else
+        {
+            mChildren.erase(it);
+            widget->_setFocusHandler(nullptr);
+            widget->_setParent(nullptr);
         }
-
-        throw GCN_EXCEPTION("There is no such widget in this container.");
     }
 
     void Widget::add(Widget* widget)
@@ -937,8 +897,7 @@ namespace gcn
 
     void Widget::moveToTop(Widget* widget)
     {
-        std::list<Widget*>::iterator iter;
-        iter = std::find(mChildren.begin(), mChildren.end(), widget);
+        const auto iter = std::find(mChildren.begin(), mChildren.end(), widget);
 
         if (iter == mChildren.end())
         {
@@ -951,8 +910,7 @@ namespace gcn
 
     void Widget::moveToBottom(Widget* widget)
     {
-        std::list<Widget*>::iterator iter;
-        iter = find(mChildren.begin(), mChildren.end(), widget);
+        const auto iter = find(mChildren.begin(), mChildren.end(), widget);
 
         if (iter == mChildren.end())
         {
@@ -965,70 +923,37 @@ namespace gcn
 
     void Widget::focusNext()
     {
-        std::list<Widget*>::const_iterator iter;
-
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
-        {
-            if ((*iter)->isFocused())
-            {
-                break;
-            }
-        }
+        const auto focusedIt = std::find_if(
+            mChildren.begin(), mChildren.end(), [](auto* w) { return w->isFocused(); });
 
-        std::list<Widget*>::const_iterator end = iter;
+        const auto next = focusedIt == mChildren.end() ? mChildren.begin() : std::next(focusedIt);
+        auto it = std::find_if(next, mChildren.end(), [](auto* w) { return w->isFocusable(); });
 
-        if (iter == mChildren.end())
+        if (it == mChildren.end())
         {
-            iter = mChildren.begin();
+            it = std::find_if(mChildren.begin(), next, [](auto* w) { return w->isFocusable(); });
         }
-
-        iter++;
-
-        for (; iter != end; iter++)
+        if (it != next)
         {
-            if (iter == mChildren.end())
-            {
-                iter = mChildren.begin();
-            }
-
-            if ((*iter)->isFocusable())
-            {
-                (*iter)->requestFocus();
-                return;
-            }
+            (*it)->requestFocus();
         }
     }
 
     void Widget::focusPrevious()
     {
-        auto iter = mChildren.rbegin();
-        for (; iter != mChildren.rend(); ++iter)
-        {
-            if ((*iter)->isFocused())
-            {
-                break;
-            }
-        }
-        const auto end = iter;
-        iter++;
+        const auto focusedRit = std::find_if(
+            mChildren.rbegin(), mChildren.rend(), [](auto* w) { return w->isFocused(); });
+
+        const auto next = focusedRit == mChildren.rend() ? mChildren.rbegin() : std::next(focusedRit);
+        auto rit = std::find_if(next, mChildren.rend(), [](auto* w) { return w->isFocusable(); });
 
-        if (iter == mChildren.rend())
+        if (rit == mChildren.rend())
         {
-            iter = mChildren.rbegin();
+            rit = std::find_if(mChildren.rbegin(), next, [](auto* w) { return w->isFocusable(); });
         }
-
-        for (; iter != end; iter++)
+        if (rit != next)
         {
-            if (iter == mChildren.rend())
-            {
-                iter = mChildren.rbegin();
-            }
-
-            if ((*iter)->isFocusable())
-            {
-                (*iter)->requestFocus();
-                return;
-            }
+            (*rit)->requestFocus();
         }
     }
 
@@ -1072,10 +997,9 @@ namespace gcn
     {
         logic();
 
-        std::list<Widget*>::const_iterator iter;
-        for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
+        for (Widget* w : mChildren)
         {
-            (*iter)->_logic();
+            w->_logic();
         }
     }
 
diff --git a/src/widgets/container.cpp b/src/widgets/container.cpp
index 641578f..0a3ed3a 100644
--- a/src/widgets/container.cpp
+++ b/src/widgets/container.cpp
@@ -130,23 +130,21 @@ namespace gcn
 
     void Container::distributeWidgetAddedEvent(Widget* source)
     {
-        ContainerListenerIterator iter;
+        const ContainerEvent event(source, this);
 
-        for (iter = mContainerListeners.begin(); iter != mContainerListeners.end(); ++iter)
+        for (ContainerListener* containerListener : mContainerListeners)
         {
-            ContainerEvent event(source, this);
-            (*iter)->widgetAdded(event);
+            containerListener->widgetAdded(event);
         }
     }
 
     void Container::distributeWidgetRemovedEvent(Widget* source)
     {
-        ContainerListenerIterator iter;
+        ContainerEvent event(source, this);
 
-        for (iter = mContainerListeners.begin(); iter != mContainerListeners.end(); ++iter)
+        for (ContainerListener* containerListener : mContainerListeners)
         {
-            ContainerEvent event(source, this);
-            (*iter)->widgetRemoved(event);
+            containerListener->widgetRemoved(event);
         }
     }
 
diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
index 166b3b9..8d84fd3 100644
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -599,12 +599,11 @@ namespace gcn
 
     void DropDown::distributeValueChangedEvent()
     {
-        SelectionListenerIterator iter;
+        const SelectionEvent event(this);
 
-        for (iter = mSelectionListeners.begin(); iter != mSelectionListeners.end(); ++iter)
+        for (SelectionListener* selectionListener : mSelectionListeners)
         {
-            SelectionEvent event(this);
-            (*iter)->valueChanged(event);
+            selectionListener->valueChanged(event);
         }
     }
 }
diff --git a/src/widgets/listbox.cpp b/src/widgets/listbox.cpp
index 4606b91..c256642 100644
--- a/src/widgets/listbox.cpp
+++ b/src/widgets/listbox.cpp
@@ -350,12 +350,11 @@ namespace gcn
 
     void ListBox::distributeValueChangedEvent()
     {
-        SelectionListenerIterator iter;
+        const SelectionEvent event(this);
 
-        for (iter = mSelectionListeners.begin(); iter != mSelectionListeners.end(); ++iter)
+        for (SelectionListener* selectionListener : mSelectionListeners)
         {
-            SelectionEvent event(this);
-            (*iter)->valueChanged(event);
+            selectionListener->valueChanged(event);
         }
     }
 
diff --git a/src/widgets/radiobutton.cpp b/src/widgets/radiobutton.cpp
index 10a7f2b..8522726 100644
--- a/src/widgets/radiobutton.cpp
+++ b/src/widgets/radiobutton.cpp
@@ -195,12 +195,9 @@ namespace gcn
     {
         if (selected && !mGroup.empty())
         {
-            GroupIterator iter, iterEnd;
-            iterEnd = mGroupMap.upper_bound(mGroup);
+            auto range = mGroupMap.equal_range(mGroup);
 
-            for (iter = mGroupMap.lower_bound(mGroup);
-                iter != iterEnd;
-                iter++)
+            for (auto iter = range.first; iter != range.second; iter++)
             {
                 if (iter->second->isSelected())
                 {
@@ -253,12 +250,9 @@ namespace gcn
     {
         if (!mGroup.empty())
         {
-            GroupIterator iter, iterEnd;
-            iterEnd = mGroupMap.upper_bound(mGroup);
+            auto range = mGroupMap.equal_range(mGroup);
 
-            for (iter = mGroupMap.lower_bound(mGroup);
-                iter != iterEnd;
-                iter++)
+            for (auto iter = range.first; iter != range.second; iter++)
             {
                 if (iter->second == this)
                 {
diff --git a/src/widgets/tabbedarea.cpp b/src/widgets/tabbedarea.cpp
index c397672..e49c1f3 100644
--- a/src/widgets/tabbedarea.cpp
+++ b/src/widgets/tabbedarea.cpp
@@ -160,8 +160,7 @@ namespace gcn
             }
         }
 
-        std::vector<std::pair<Tab*, Widget*> >::iterator iter;
-        for (iter = mTabs.begin(); iter != mTabs.end(); iter++)
+        for (auto iter = mTabs.begin(); iter != mTabs.end(); ++iter)
         {
             if (iter->first == tab)
             {
@@ -171,8 +170,7 @@ namespace gcn
             }
         }
 
-        std::vector<Tab*>::iterator iter2;
-        for (iter2 = mTabsToDelete.begin(); iter2 != mTabsToDelete.end(); iter2++)
+        for (auto iter2 = mTabsToDelete.begin(); iter2 != mTabsToDelete.end(); ++iter2)
         {
             if (*iter2 == tab)
             {

From 7c12281fec89f2ce50675aca043549c996e36ac1 Mon Sep 17 00:00:00 2001
From: Jarod42 <Jarod42@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:39:23 +0200
Subject: [PATCH 19/19] [CMake] Fix typo: include/guisan.text.hpp ->
 include/guisan/text.hpp

---
 CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7b9910..2e20ceb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,8 @@ INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/include")
 ADD_COMPILE_DEFINITIONS(GUICHAN_BUILD GUICHAN_EXTENSION_BUILD)
 
 # The Guisan core library
-FILE(GLOB GUISAN_HEADER include/guisan.hpp)
-FILE(GLOB GUISAN_HEADERS
+SET(GUISAN_HEADER include/guisan.hpp)
+SET(GUISAN_HEADERS
   include/guisan/actionevent.hpp
   include/guisan/actionlistener.hpp
   include/guisan/cliprectangle.hpp
@@ -53,7 +53,7 @@ FILE(GLOB GUISAN_HEADERS
   include/guisan/rectangle.hpp
   include/guisan/selectionevent.hpp
   include/guisan/selectionlistener.hpp
-  include/guisan.text.hpp
+  include/guisan/text.hpp
   include/guisan/widget.hpp
   include/guisan/widgetlistener.hpp
 )
@@ -76,11 +76,11 @@ ELSE(BUILD_GUISAN_SHARED)
 ENDIF(BUILD_GUISAN_SHARED)
 
 ADD_LIBRARY(${PROJECT_NAME} ${GUISAN_LIBRARY_TYPE}
-	${GUISAN_HEADER} 
-	${GUISAN_HEADERS} 
-	${GUISAN_WIDGET_HEADERS} 
+	${GUISAN_HEADER}
+	${GUISAN_HEADERS}
+	${GUISAN_WIDGET_HEADERS}
 	${GUISAN_CONTRIB_WIDGET_HEADERS}
-	${GUISAN_SRC} 
+	${GUISAN_SRC}
 	${GUISAN_WIDGET_SRC})
 
 ADD_CUSTOM_TARGET(lib DEPENDS ${PROJECT_NAME}) # Create symlink