Merge remote branch 'origin/V8_5_asterstudy'

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_Selection.h

diff --git a/src/SMESHGUI/SMESHGUI_Selection.h b/src/SMESHGUI/SMESHGUI_Selection.h
index c7b7915abf5628b1dc082009de09b9f6d8a12e4c..115b0e46f60ef1e6845ab64a81d6cca4afaa15f3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Selection.h
+++ b/src/SMESHGUI/SMESHGUI_Selection.h
@@ -71,8 +71,8 @@ public:
   virtual int             nbChildren( int ) const;
   virtual bool            isContainer( int ) const;
 
-  // parameters got from actor return nothing if an actor is not visible
-  virtual QList<QVariant> elemTypes( int ) const;
+  // parameters got from actor, return nothing if an actor is not visible
+  virtual QList<QVariant> elemTypes( int, bool ) const; // == objElemTypes w/o actor
   virtual QList<QVariant> labeledTypes( int ) const;
   virtual QString         displayMode( int ) const;
   virtual QString         shrinkMode( int ) const;
@@ -85,9 +85,10 @@ public:
   
   SMESH_Actor*            getActor( int ) const;
 
-  static int              type( const QString&, _PTR(Study) );
+  static int              type( const QString& );
   static QString          typeName( const int );
-
+  static  int             guiState();
+  
   bool                    isImported( const int ) const;
 
 private: