Remove unnecessary Container::create_child

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

diff --git a/source/container.cpp b/source/container.cpp
index 9ef46f1ab85fcd511238ecb83f3f45cf912b7caa..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();
@@ -80,9 +75,9 @@ void Container::reposition_child(Widget &child, const Part &part) const
        child.set_geometry(determine_child_geometry(child, part));
 }
 
-list<Widget *> Container::get_children() const
+vector<Widget *> Container::get_children() const
 {
-       list<Widget *> result;
+       vector<Widget *> result;
        for(const Child *c: children)
                result.push_back(c->widget);
        return result;
@@ -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;
@@ -116,7 +110,9 @@ void Container::raise(Widget &wdg)
        if(i==children.end())
                throw hierarchy_error("widget not in container");
 
-       children.splice(children.end(), children, i);
+       Child *c = *i;
+       children.erase(i);
+       children.push_back(c);
 }
 
 void Container::set_pointer_focus(Widget *wdg, bool grab)