Interface of action() virtual function and onAccelAction() has changed: now it return...

diff --git a/src/SUIT/SUIT_Accel.cxx b/src/SUIT/SUIT_Accel.cxx
index a82219550ac9a57a6ff497b749b3d02e5fea793e..6d67893a02399ddcae19dec10a9fc6d55eafc22b 100644 (file)
--- a/src/SUIT/SUIT_Accel.cxx
+++ b/src/SUIT/SUIT_Accel.cxx
@@ -120,8 +120,7 @@ bool SUIT_Accel::eventFilter( QObject *obj, QEvent *event )
       if ( myMap.contains( type ) ) {
        IdActionMap idActionMap = myMap[type];
        if ( idActionMap.contains( key ) ) {
-         vw->onAccelAction( idActionMap[key] );
-         return true;
+         return vw->onAccelAction( idActionMap[key] );
        }
       }
     }

diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx
index 0212bc8c9cb22501f7c770e8b2d55421fdc0c94d..a0e154a810081dc0e782f0e2a8affe82965c0165 100755 (executable)
--- a/src/SUIT/SUIT_ViewWindow.cxx
+++ b/src/SUIT/SUIT_ViewWindow.cxx
@@ -165,15 +165,16 @@ bool SUIT_ViewWindow::event( QEvent* e )
 
 /*! Called by SUIT_Accel::onActivated() when a key accelerator was activated and this window was active
 */
-void SUIT_ViewWindow::onAccelAction( int _action )
+bool SUIT_ViewWindow::onAccelAction( int _action )
 {
-  action( _action );
+  return action( _action );
 }
 
 /*! action  handle standard action (zoom, pan) or custom action.  to be redefined in successors.
 */
-void SUIT_ViewWindow::action( const int  )
+bool SUIT_ViewWindow::action( const int  )
 {
+  return true;
 }
 
 /*!

diff --git a/src/SUIT/SUIT_ViewWindow.h b/src/SUIT/SUIT_ViewWindow.h
index 5be546b76efca12097e3abca86530e490d3fefe1..c32e6776a0510e45c1f30acab7b8e36a1401ec13 100755 (executable)
--- a/src/SUIT/SUIT_ViewWindow.h
+++ b/src/SUIT/SUIT_ViewWindow.h
@@ -49,7 +49,7 @@ public:
   virtual QImage    dumpView();
   virtual bool      dumpViewToFormat( const QString& fileName, const QString& format );
 
-  void              onAccelAction( int );
+  bool              onAccelAction( int );
 
   virtual QString   getVisualParameters();
   virtual void      setVisualParameters( const QString& parameters );
@@ -72,7 +72,7 @@ protected:
   void              closeEvent( QCloseEvent* );
   virtual void      contextMenuEvent( QContextMenuEvent* );
   virtual QString   filter() const;
-  virtual void      action( const int );
+  virtual bool      action( const int );
 
   SUIT_Desktop*     myDesktop;
   SUIT_ViewManager* myManager;