From 65482a36f681e66ec4f04213b83453adbc36a281 Mon Sep 17 00:00:00 2001 From: asv Date: Wed, 8 Jun 2005 12:45:25 +0000 Subject: [PATCH 1/1] activateModule/deactivateModule functions are made "bool". --- src/SMESHGUI/SMESHGUI.cxx | 9 +++++---- src/SMESHGUI/SMESHGUI.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 0788a118f..4b63550e0 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -3009,24 +3009,25 @@ void SMESHGUI::initialize( CAM_Application* app ) popupMgr()->insert( separator(), -1, -1 ); } -void SMESHGUI::activateModule( SUIT_Study* study ) +bool SMESHGUI::activateModule( SUIT_Study* study ) { - SalomeApp_Module::activateModule( study ); + bool res = SalomeApp_Module::activateModule( study ); setMenuShown( true ); setToolShown( true ); + return res; //SetSettings( desktop() ); } -void SMESHGUI::deactivateModule( SUIT_Study* study ) +bool SMESHGUI::deactivateModule( SUIT_Study* study ) { setMenuShown( false ); setToolShown( false ); EmitSignalCloseAllDialogs(); - SalomeApp_Module::deactivateModule( study ); + return SalomeApp_Module::deactivateModule( study ); } void SMESHGUI::OnGUIEvent() diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h index 3ed5b2922..c99de05d2 100644 --- a/src/SMESHGUI/SMESHGUI.h +++ b/src/SMESHGUI/SMESHGUI.h @@ -97,8 +97,8 @@ public : void EmitSignalCloseAllDialogs() ; public slots: - virtual void deactivateModule( SUIT_Study* ); - virtual void activateModule( SUIT_Study* ); + virtual bool deactivateModule( SUIT_Study* ); + virtual bool activateModule( SUIT_Study* ); private slots: void OnGUIEvent(); -- 2.30.2