Merge from V6_main 11/02/2013

[modules/smesh.git] / src / OBJECT / SMESH_ObjectDef.h

diff --git a/src/OBJECT/SMESH_ObjectDef.h b/src/OBJECT/SMESH_ObjectDef.h
index 4532a019744afe2d85f07320114755601a7bd19b..56f7543759af5bef31f1fd3bad9077656447550c 100644 (file)
--- a/src/OBJECT/SMESH_ObjectDef.h
+++ b/src/OBJECT/SMESH_ObjectDef.h
@@ -70,6 +70,7 @@ public:
   virtual int               GetEntities( const SMDSAbs_ElementType, TEntityList& ) const = 0;
   virtual bool              IsNodePrs() const = 0;
   virtual SMDS_Mesh*        GetMesh() const = 0;
+  virtual SMESH::SMESH_Mesh_ptr GetMeshServer() = 0;
 
   virtual bool              IsValid() const;
 
@@ -135,10 +136,11 @@ public:
 
   virtual void              UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor );
   
-  SMESH::SMESH_Mesh_ptr     GetMeshServer() { return myClient.GetMeshServer(); }
-  SMDS_Mesh*                GetMesh() const { return myClient.GetMesh(); }
+  virtual SMESH::SMESH_Mesh_ptr GetMeshServer() { return myClient.GetMeshServer(); }
+  virtual SMDS_Mesh*        GetMesh() const { return myClient.GetMesh(); }
 
 protected:
+
   SMESH_Client              myClient;
   vtkUnstructuredGrid*      myEmptyGrid;
 };
@@ -161,6 +163,7 @@ public:
   virtual void              UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor );
   virtual int               GetElemDimension( const int theObjId );
   virtual SMDS_Mesh*        GetMesh() const { return myMeshObj->GetMesh(); }
+  virtual SMESH::SMESH_Mesh_ptr GetMeshServer() { return myMeshObj->GetMeshServer(); }
   
 protected: