X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=a8c3133d0632238831c5b1692f29c2e9c32c3876;hb=103ceeace366c6d80fce323438b31b9bbc167915;hp=393973cc2ab7293adcd32c3e939442780e0ff23e;hpb=9678abb23abe450109e2feda081f5bba5f20cc94;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index 393973c..a8c3133 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -35,6 +35,8 @@ void Container::remove(Widget &wdg)
 	if(i==children.end())
 		throw hierarchy_error("widget not in container");
 
+	if(&wdg==saved_input_focus)
+		saved_input_focus = nullptr;
 	wdg.set_parent(nullptr);
 	delete *i;
 	children.erase(i);
@@ -78,9 +80,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;
@@ -101,8 +103,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;
@@ -114,7 +115,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)
@@ -317,7 +320,7 @@ bool Container::character(wchar_t ch)
 
 void Container::focus_in()
 {
-	if(saved_input_focus && saved_input_focus->get_parent()==this)
+	if(saved_input_focus)
 		set_input_focus(saved_input_focus);
 	Widget::focus_in();
 }