X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=03dff1137bfdf6416f6d755c61bae65604f8733b;hb=5bb0cc92a28a7862571249a2512bcd23ed272344;hp=23227331139edab708849e8a63379d78ef5835d1;hpb=2b3940dd34611a6f669278de9a5146b6e85f6119;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index 2322733..03dff11 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -17,6 +17,7 @@ Container::Container():
 	pointer_focus(0),
 	pointer_grabbed(false),
 	input_focus(0),
+	saved_input_focus(0),
 	touch_focus(0)
 { }
 
@@ -312,8 +313,16 @@ bool Container::character(wchar_t ch)
 		return false;
 }
 
+void Container::focus_in()
+{
+	if(saved_input_focus && saved_input_focus->get_parent()==this)
+		set_input_focus(saved_input_focus);
+	Widget::focus_in();
+}
+
 void Container::focus_out()
 {
+	saved_input_focus = input_focus;
 	set_input_focus(0);
 	Widget::focus_out();
 }