Remove unnecessary Container::create_child

[libs/gltk.git] / source / container.cpp

diff --git a/source/container.cpp b/source/container.cpp
index 64e3a9a7e296ce374819abddc035112a18948e53..5c175031d76515e8b2bd2c269bdd9806baeb39bc 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -21,7 +21,7 @@ Container::~Container()
 void Container::add(Widget &wdg)
 {
        wdg.set_parent(this);
-       children.push_back(create_child(&wdg));
+       children.push_back(new Child(*this, &wdg));
        if(wdg.get_animation_interval())
                check_animation_interval();
        children_rebuild_needed = true;
@@ -45,11 +45,6 @@ void Container::remove(Widget &wdg)
        on_child_removed(wdg);
 }
 
-Container::Child *Container::create_child(Widget *wdg)
-{
-       return new Child(*this, wdg);
-}
-
 Geometry Container::determine_child_geometry(const Widget &child, const Part &part) const
 {
        Geometry pgeom = part.get_geometry();
@@ -103,8 +98,7 @@ Widget *Container::find_descendant_at(int x, int y) const
        if(Container *cont = dynamic_cast<Container *>(wdg))
        {
                const Geometry &cgeom = wdg->get_geometry();
-               Widget *wdg2 = cont->find_descendant_at(x-cgeom.x, y-cgeom.y);
-               if(wdg2)
+               if(Widget *wdg2 = cont->find_descendant_at(x-cgeom.x, y-cgeom.y))
                        return wdg2;
        }
        return wdg;