Apply guichan's changes from 753608c0c8cd0196c19c467db0f8df5f61d99b3c…

… (25/dec/2007) to 8a4565b962dc5c71d1c115bdce4ddc3906575fa1 (31/dec/2007):

- The drawing of the text field widget and the drop down widget have been enhanced.
- Drawing has been enhanced.

+ Fix dropdown keyPressed event (handled by both listbox and dropdown).

TODO

@@ -1,4 +1,4 @@
-* Continue rebasing from 753608c0c8cd0196c19c467db0f8df5f61d99b3c
+* Continue rebasing from b62d153a5dd699add2109671d4569578dd4f2671
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.

include/guisan/widget.hpp

@@ -136,7 +136,7 @@ namespace gcn
          * @param graphics a graphics object to draw with.
          * @see setFrameSize, getFrameSize
          */
-        virtual void drawFrame(Graphics* graphics) { }
+        virtual void drawFrame(Graphics* graphics);
 
         /**
          * Sets the size of the widget's frame. The frame is not considered a part of

include/guisan/widgets/button.hpp

@@ -149,8 +149,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
 
         // Inherited from FocusListener
 

include/guisan/widgets/checkbox.hpp

@@ -144,8 +144,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
 
         // Inherited from KeyListener
 

include/guisan/widgets/container.hpp

@@ -164,7 +164,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
 
     protected:
         /**

include/guisan/widgets/dropdown.hpp

@@ -177,8 +177,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
         void setBaseColor(const Color& color);
 
         void setBackgroundColor(const Color& color);

include/guisan/widgets/icon.hpp

@@ -93,7 +93,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
 
     protected:
         /**

include/guisan/widgets/inputbox.hpp

@@ -119,8 +119,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
 
         // Inherited from MouseListener
 

include/guisan/widgets/label.hpp

@@ -130,7 +130,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
 
     protected:
         /**

include/guisan/widgets/listbox.hpp

@@ -189,8 +189,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
         virtual void logic();
 
 

include/guisan/widgets/messagebox.hpp

@@ -209,8 +209,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
 
         // Inherited from MouseListener
 

include/guisan/widgets/progressbar.hpp

@@ -190,7 +190,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
 
     protected:
         /**

include/guisan/widgets/radiobutton.hpp

@@ -169,8 +169,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
 
         // Inherited from KeyListener
 

include/guisan/widgets/scrollarea.hpp

@@ -306,8 +306,6 @@ namespace gcn
 
         virtual void draw(Graphics *graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
         virtual void logic();
 
         void setWidth(int width);

include/guisan/widgets/slider.hpp

@@ -221,8 +221,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
 
         // Inherited from MouseListener.
 

include/guisan/widgets/tab.hpp

@@ -134,8 +134,6 @@ namespace gcn
 
         virtual void draw(Graphics *graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
 
         // Inherited from MouseListener
 

include/guisan/widgets/tabbedarea.hpp

@@ -184,8 +184,6 @@ namespace gcn
 
         virtual void draw(Graphics *graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
         virtual void logic();
 
         void setWidth(int width);

include/guisan/widgets/textbox.hpp

@@ -242,8 +242,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
         virtual void fontChanged();
 
 

include/guisan/widgets/textfield.hpp

@@ -139,8 +139,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
 
         // Inherited from MouseListener
 

include/guisan/widgets/window.hpp

@@ -204,8 +204,6 @@ namespace gcn
 
         virtual void draw(Graphics* graphics);
 
-        virtual void drawFrame(Graphics* graphics);
-
 
         // Inherited from MouseListener
 

src/widget.cpp

@@ -68,6 +68,7 @@
 #include "guisan/event.hpp"
 #include "guisan/exception.hpp"
 #include "guisan/focushandler.hpp"
+#include "guisan/graphics.hpp"
 #include "guisan/keyinput.hpp"
 #include "guisan/keylistener.hpp"
 #include "guisan/mouseinput.hpp"
@@ -114,6 +115,30 @@ namespace gcn
         mWidgets.remove(this);
     }
 
+    void Widget::drawFrame(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;
+
+        unsigned int i;
+        for (i = 0; i < getFrameSize(); ++i)
+        {
+            graphics->setColor(shadowColor);
+            graphics->drawLine(i,i, width - i, i);
+            graphics->drawLine(i,i + 1, i, height - i - 1);
+            graphics->setColor(highlightColor);
+            graphics->drawLine(width - i,i + 1, width - i, height - i);
+            graphics->drawLine(i,height - i, width - i - 1, height - i);
+        }
+    }
+
     void Widget::_setParent(Widget* parent)
     {
         mParent = parent;

src/widgets/button.cpp

@@ -207,30 +207,6 @@ namespace gcn
         }
     }
 
-    void Button::drawFrame(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;
-
-        unsigned int i;
-        for (i = 0; i < getFrameSize(); ++i)
-        {
-            graphics->setColor(shadowColor);
-            graphics->drawLine(i,i, width - i, i);
-            graphics->drawLine(i,i + 1, i, height - i - 1);
-            graphics->setColor(highlightColor);
-            graphics->drawLine(width - i,i + 1, width - i, height - i);
-            graphics->drawLine(i,height - i, width - i - 1, height - i);
-        }
-    }
-
     void Button::adjustSize()
     {
         setWidth(getFont()->getWidth(mCaption) + 2*mSpacing);

src/widgets/checkbox.cpp

@@ -104,30 +104,6 @@ namespace gcn
         graphics->drawText(getCaption(), h - 2, 0);
     }
 
-    void CheckBox::drawFrame(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;
-
-        unsigned int i;
-        for (i = 0; i < getFrameSize(); ++i)
-        {
-            graphics->setColor(shadowColor);
-            graphics->drawLine(i,i, width - i, i);
-            graphics->drawLine(i,i + 1, i, height - i - 1);
-            graphics->setColor(highlightColor);
-            graphics->drawLine(width - i,i + 1, width - i, height - i);
-            graphics->drawLine(i,height - i, width - i - 1, height - i);
-        }
-    }
-
     void CheckBox::drawBox(Graphics* graphics)
     {
         int h = getHeight() - 2;

src/widgets/container.cpp

@@ -87,30 +87,6 @@ namespace gcn
         drawChildren(graphics);
     }
 
-    void Container::drawFrame(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;
-
-        unsigned int i;
-        for (i = 0; i < getFrameSize(); ++i)
-        {
-            graphics->setColor(shadowColor);
-            graphics->drawLine(i,i, width - i, i);
-            graphics->drawLine(i,i + 1, i, height - i - 1);
-            graphics->setColor(highlightColor);
-            graphics->drawLine(width - i,i + 1, width - i, height - i);
-            graphics->drawLine(i,height - i, width - i - 1, height - i);
-        }
-    }
-
     void Container::setOpaque(bool opaque)
     {
         mOpaque = opaque;