From: asv Date: Sat, 6 May 2006 06:20:59 +0000 (+0000) Subject: An error that arised because of merge was fixed. eventFilter() function. viewWindow... X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FOCC_debug_for_3_2_0b1;p=modules%2Fgui.git An error that arised because of merge was fixed. eventFilter() function. viewWindow->hasFocus() must NOT be there! it is checked in action() funcitons of ViewWindows if needed. --- diff --git a/src/SUIT/SUIT_Accel.cxx b/src/SUIT/SUIT_Accel.cxx index 6d67893a0..600ab2ebd 100644 --- a/src/SUIT/SUIT_Accel.cxx +++ b/src/SUIT/SUIT_Accel.cxx @@ -115,7 +115,7 @@ bool SUIT_Accel::eventFilter( QObject *obj, QEvent *event ) const int key = getAccelKey( event ); if ( key ) { SUIT_ViewWindow* vw = ::getParentViewWindow( obj ); - if ( vw && vw->hasFocus() ) { + if ( vw ) { QString type = vw->getViewManager()->getViewModel()->getType(); if ( myMap.contains( type ) ) { IdActionMap idActionMap = myMap[type];