Only pass key and navigation events to enabled widgets

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

diff --git a/source/container.cpp b/source/container.cpp
index 068986b15aca7b329626974c6349941a8d68422f..91fa48758c8a60ec90cba48331798b3201906ae1 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -274,7 +274,7 @@ void Container::touch_motion(int x, int y, unsigned finger)
 
 bool Container::key_press(unsigned key, unsigned mod)
 {
-       if(input_focus)
+       if(input_focus && input_focus->is_enabled())
                return input_focus->key_press(key, mod);
        else
                return false;
@@ -282,7 +282,7 @@ bool Container::key_press(unsigned key, unsigned mod)
 
 bool Container::key_release(unsigned key, unsigned mod)
 {
-       if(input_focus)
+       if(input_focus && input_focus->is_enabled())
                return input_focus->key_release(key, mod);
        else
                return false;
@@ -290,7 +290,7 @@ bool Container::key_release(unsigned key, unsigned mod)
 
 bool Container::character(wchar_t ch)
 {
-       if(input_focus)
+       if(input_focus && input_focus->is_enabled())
                return input_focus->character(ch);
        else
                return false;
@@ -302,6 +302,14 @@ void Container::focus_out()
        Widget::focus_out();
 }
 
+bool Container::navigate(Navigation nav)
+{
+       if(input_focus && input_focus->is_enabled())
+               return input_focus->navigate(nav);
+       else
+               return false;
+}
+
 void Container::on_reparent()
 {
        for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)