Basic container removal

CMakeLists.txt

@@ -22,7 +22,6 @@ FILE(GLOB GUISAN_HEADER include/guisan.hpp)
 FILE(GLOB GUISAN_HEADERS
   include/guisan/actionevent.hpp
   include/guisan/actionlistener.hpp
-  include/guisan/basiccontainer.hpp
   include/guisan/cliprectangle.hpp
   include/guisan/color.hpp
   include/guisan/containerevent.hpp

ChangeLog

@@ -1,5 +1,10 @@
 Version 1.1.0
 =============
+* BasicContainer and Widget has been merged making every Widget
+  a possible container. The merge makes it a lot easier to
+  implement container widgets. With the merge there is no need
+  for container widgets to explicitly call drawChildren and
+  logicChildren as that is now handled automatically by Widget.
 * Rectangle has been enhanced with methods for adding rectangles,
   getting the intersection between rectangles and checking if
   a rectangle contains another rectangle.

Guisan.vcxproj

@@ -137,7 +137,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\actionevent.cpp" />
-    <ClCompile Include="src\basiccontainer.cpp" />
     <ClCompile Include="src\cliprectangle.cpp" />
     <ClCompile Include="src\color.cpp" />
     <ClCompile Include="src\containerevent.cpp" />
@@ -196,7 +195,6 @@
     <ClInclude Include="include\guisan.hpp" />
     <ClInclude Include="include\guisan\actionevent.hpp" />
     <ClInclude Include="include\guisan\actionlistener.hpp" />
-    <ClInclude Include="include\guisan\basiccontainer.hpp" />
     <ClInclude Include="include\guisan\cliprectangle.hpp" />
     <ClInclude Include="include\guisan\color.hpp" />
     <ClInclude Include="include\guisan\containerevent.hpp" />

SConstruct

@@ -60,7 +60,6 @@ SConscript('examples/SConscript')
 common_headers = [
     'include/guisan/actionevent.hpp',
     'include/guisan/actionlistener.hpp',
-    'include/guisan/basiccontainer.hpp',
     'include/guisan/cliprectangle.hpp',
     'include/guisan/color.hpp',
     'include/guisan/containerevent.hpp',

TODO

@@ -1,4 +1,4 @@
-* Continue rebasing from 4335d513e97c1f01f8bba5487932d1d5309459ca
+* Continue rebasing from 636e1837a62cb3126d6a8554856c1219160161a9
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.

demo/ff/src/ffcontainer.cpp

@@ -110,14 +110,10 @@ void FFContainer::draw(gcn::Graphics* graphics)
         {
             graphics->setColor(c * (1.0 - i / 18.0));
             graphics->fillRectangle(gcn::Rectangle(4, (i * height + 4),
-		getWidth()-8, (i * height ) + height));
+            getWidth()-8, (i * height ) + height));
         }
     }
 
-    graphics->pushClipArea(gcn::Rectangle(0, mCurrentSlide, getWidth(), getHeight()));
-    drawChildren(graphics);
-    graphics->popClipArea();
-
     for (i = 5; i < getHeight()-10; i+=5)
     {
         graphics->drawImage(mVertical, 0, i);