Issue 0020169: Automatically set the good viewer at module activation

diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx
index eca4c7852d0f8c30b303847f62da57c02b1e69ab..53e91aab4b4595a282727c6f3a98b2a39d18a17b 100644 (file)
--- a/src/Qtx/QtxWorkstack.cxx
+++ b/src/Qtx/QtxWorkstack.cxx
@@ -1344,6 +1344,8 @@ QtxWorkstackChild::QtxWorkstackChild( QWidget* wid, QWidget* parent, Qt::WindowF
   {
     myWidget->setParent( this, f );
     myWidget->installEventFilter( this );
+    if ( myWidget->focusProxy() )
+      myWidget->focusProxy()->installEventFilter( this );
     myWidget->setVisible( myWidget->isVisibleTo( myWidget->parentWidget() ) );
 
     QVBoxLayout* base = new QVBoxLayout( this );
@@ -1368,6 +1370,8 @@ QtxWorkstackChild::~QtxWorkstackChild()
 
   widget()->hide();
   widget()->removeEventFilter( this );
+  if ( widget()->focusProxy() )
+    widget()->focusProxy()->removeEventFilter( this );
 
   widget()->setParent( 0 );
 }