Implement a selection feature in Entry widget

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

diff --git a/source/container.cpp b/source/container.cpp
index 62e6e125429bb7a10ca10b33476bc5d36fbd1a92..23227331139edab708849e8a63379d78ef5835d1 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -151,12 +151,10 @@ void Container::set_input_focus(Widget *wdg)
                        input_focus->focus_out();
 
                input_focus = wdg;
+               on_input_focus_changed(input_focus);
 
                if(input_focus)
-               {
-                       raise(*wdg);
                        input_focus->focus_in();
-               }
        }
 }
 
@@ -356,6 +354,12 @@ void Container::on_reparent()
        }
 }
 
+void Container::on_input_focus_changed(Widget *wdg)
+{
+       if(wdg)
+               raise(*wdg);
+}
+
 
 Container::Child::Child(Container &c, Widget *w):
        container(c),
@@ -388,9 +392,10 @@ void Container::Child::visibility_changed(bool v)
 
 void Container::Child::request_focus()
 {
-       container.set_input_focus(widget);
        if(container.parent && container.visible)
                container.set_focus();
+       if(container.state&FOCUS)
+               container.set_input_focus(widget);
 }
 
 void Container::Child::grab_pointer()