Merge pull request #53 from Jarod42/cleanup

Cleanup
kallisti5 · Aug 27, 2024 · 081b759 · 081b759
2 parents cac5cdb + 861fc9e
commit 081b759
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/TODO b/TODO
@@ -1,4 +1,4 @@
-* Continue rebasing from a451b58f3da13d686702689ccbe92c44b8362c6e
+* Continue rebasing from e3b13a3923cbe3e46c231b4f2817d2f0cabb58f9
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.

diff --git a/include/guisan/imageloader.hpp b/include/guisan/imageloader.hpp
@@ -57,10 +57,10 @@
 #ifndef GCN_IMAGELOADER_HPP
 #define GCN_IMAGELOADER_HPP
 
-#include <iosfwd>
-
 #include "guisan/platform.hpp"
 
+#include <string>
+
 namespace gcn
 {
     class Image;

diff --git a/src/widgets/textbox.cpp b/src/widgets/textbox.cpp
@@ -81,7 +81,6 @@ namespace gcn
         addKeyListener(this);
         adjustSize();
         setFrameSize(1);
-        setText("");
     }
 
     TextBox::TextBox(const std::string& text)
@@ -133,22 +132,6 @@ namespace gcn
 
     void TextBox::draw(Graphics* graphics)
     {
-        /*
-        int width = getWidth() + getFrameSize() * 2 - 1;
-        int height = getHeight() + getFrameSize() * 2 - 1;
-
-        graphics->setColor(getBackgroundColor());
-
-        unsigned int i;
-        for (i = 0; i < getFrameSize(); ++i)
-        {
-            graphics->drawLine(i,i, width - i, i);
-            graphics->drawLine(i,i + 1, i, height - i - 1);
-            graphics->drawLine(width - i,i + 1, width - i, height - i);
-            graphics->drawLine(i,height - i, width - i - 1, height - i);
-        }
-        */
-
         unsigned int i;
 
         if (mOpaque)