0013946: Implement QActionGroup functionality for SALOME series 5x

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index b9867a0fec25b31921498c40712bf447564cd837..39b570b2bc07b558290089a66b5b92be453dd3c3 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@ -37,6 +37,7 @@
 
 #include <QtxWorkstack.h>
 #include <QtxWorkspace.h>
+#include <QtxActionGroup.h>
 #include <QtxActionMenuMgr.h>
 #include <QtxActionToolMgr.h>
 
@@ -50,7 +51,6 @@
 #include <QMenuBar>
 #include <QMenu>
 #include <QAction>
-#include <QActionGroup>
 
 #include "sipAPISalomePyQtGUI.h"
 
@@ -1669,18 +1669,17 @@ QAction* SALOME_PYQT_Module::createAction( const int id, const QString& text, co
   \param toggle \c true for checkable action
   \return created action
 */
-/*
-QActionGroup* SALOME_PYQT_Module::createActionGroup(const int id, const bool exclusive)
+QtxActionGroup* SALOME_PYQT_Module::createActionGroup(const int id, const bool exclusive)
 {
-  QActionGroup* a = action( id );
-  if ( !a || !a->inherits( "QActionGroup" ) ) {
-    a = new QActionGroup( this );
+  QtxActionGroup* a = qobject_cast<QtxActionGroup*>( action( id ) );
+  if ( !a ) {
+    a = new QtxActionGroup( this );
     SalomeApp_Module::registerAction( id, a );
   }
   a->setExclusive( exclusive );
-  return (QActionGroup*)a;
+  return a;
 }
-*/
+
 /*! 
   \brief Load icon from resource file.
   \param fileName icon file name

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h
index 510fcabb97eb66bb293101cc875d7cb9af8a7b97..6af84654df63a699c267b899e766a1c894a6097e 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h
@@ -39,7 +39,7 @@
 class SALOME_PYQT_PyInterp;
 class SUIT_ViewWindow;
 class QAction;
-class QActionGroup;
+class QtxActionGroup;
 class QMenu;
 
 class SALOME_PYQT_EXPORT SALOME_PYQT_Module: public SalomeApp_Module
@@ -109,7 +109,7 @@ public:
   QAction*                   createAction( const int, const QString&, const QString&, 
                                           const QString&, const QString&, const int, 
                                           const bool = false, QObject* = 0 );
-  //  QActionGroup*              createActionGroup( const int, const bool );
+  QtxActionGroup*            createActionGroup( const int, const bool );
 
 
   QIcon                      loadIcon( const QString& fileName );