Tabbed area

TODO

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

include/guisan/widgets/tabbedarea.hpp

@@ -214,8 +214,6 @@ namespace gcn
 
         virtual void draw(Graphics *graphics);
 
-        virtual void logic();
-
         void setWidth(int width);
 
         void setHeight(int height);
@@ -224,6 +222,8 @@ namespace gcn
 
         void setDimension(const Rectangle& dimension);
 
+        void setBaseColor(const Color& color);
+
         // Inherited from ActionListener
 
         void action(const ActionEvent& actionEvent);

src/widgets/tabbedarea.cpp

@@ -317,10 +317,6 @@ namespace gcn
         drawChildren(graphics);
     }
 
-    void TabbedArea::logic()
-    {
-    }
-
     void TabbedArea::adjustSize()
     {
         int maxTabHeight = 0;
@@ -363,26 +359,51 @@ namespace gcn
 
     void TabbedArea::setWidth(int width)
     {
-        Widget::setWidth(width);
+        // This may seem odd, but we want the TabbedArea to adjust
+        // its size properly before we call Widget::setWidth as
+        // Widget::setWidth might distribute a resize event.
+        gcn::Rectangle dim = mDimension;
+        mDimension.width = width;
         adjustSize();
+        mDimension = dim;
+        Widget::setWidth(width);
     }
 
     void TabbedArea::setHeight(int height)
     {
-        Widget::setHeight(height);
+        // This may seem odd, but we want the TabbedArea to adjust
+        // its size properly before we call Widget::setHeight as
+        // Widget::setHeight might distribute a resize event.
+        gcn::Rectangle dim = mDimension;
+        mDimension.height = height;
         adjustSize();
+        mDimension = dim;
+        Widget::setHeight(height);
     }
 
     void TabbedArea::setSize(int width, int height)
     {
-        Widget::setSize(width, height);
+        // This may seem odd, but we want the TabbedArea to adjust
+        // its size properly before we call Widget::setSize as
+        // Widget::setSize might distribute a resize event.
+        gcn::Rectangle dim = mDimension;
+        mDimension.width = width;
+        mDimension.height = height;
         adjustSize();
+        mDimension = dim;
+        Widget::setSize(width, height);
     }
 
     void TabbedArea::setDimension(const Rectangle& dimension)
     {
-        Widget::setDimension(dimension);
+        // This may seem odd, but we want the TabbedArea to adjust
+        // it's size properly before we call Widget::setDimension as
+        // Widget::setDimension might distribute a resize event.
+        gcn::Rectangle dim = mDimension;
+        mDimension = dimension;
         adjustSize();
+        mDimension = dim;
+        Widget::setDimension(dimension);
     }
 
     void TabbedArea::keyPressed(KeyEvent& keyEvent)
@@ -480,4 +501,11 @@ namespace gcn
 
         setSelectedTab(tab);
     }
-}
+
+    void TabbedArea::setBaseColor(const Color& color)
+    {
+        Widget::setBaseColor(color);
+        mWidgetContainer->setBaseColor(color);
+        mTabContainer->setBaseColor(color);
+    }
+} // namespace gcn