0030674: Visualization, AIS_InteractiveObject - fix accessibility of several properties

[occt.git] / src / PrsMgr / PrsMgr_Prs.hxx

diff --git a/src/PrsMgr/PrsMgr_Prs.hxx b/src/PrsMgr/PrsMgr_Prs.hxx
index 6cc2967..9b2b933 100644 (file)
--- a/src/PrsMgr/PrsMgr_Prs.hxx
+++ b/src/PrsMgr/PrsMgr_Prs.hxx
@@ -17,30 +17,29 @@
 #ifndef _PrsMgr_Prs_HeaderFile
 #define _PrsMgr_Prs_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <PrsMgr_PresentationPointer.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <PrsMgr_TypeOfPresentation3d.hxx>
 #include <TColStd_Array2OfReal.hxx>
+
 class Graphic3d_StructureManager;
 class Graphic3d_Structure;
 class Graphic3d_DataStructureManager;
+class PrsMgr_Presentation;
 
-class PrsMgr_Prs;
 DEFINE_STANDARD_HANDLE(PrsMgr_Prs, Prs3d_Presentation)
 
 class PrsMgr_Prs : public Prs3d_Presentation
 {
-
+  DEFINE_STANDARD_RTTIEXT(PrsMgr_Prs, Prs3d_Presentation)
 public:
   
-  Standard_EXPORT PrsMgr_Prs(const Handle(Graphic3d_StructureManager)& theStructManager, const PrsMgr_PresentationPointer& thePresentation, const PrsMgr_TypeOfPresentation3d theTypeOfPresentation3d);
-  
-  Standard_EXPORT void Compute() Standard_OVERRIDE;
+  Standard_EXPORT PrsMgr_Prs (const Handle(Graphic3d_StructureManager)& theStructManager,
+                              PrsMgr_Presentation* thePresentation,
+                              PrsMgr_TypeOfPresentation3d theTypeOfPresentation3d);
+
+  Standard_EXPORT virtual void Compute() Standard_OVERRIDE;
   
-  Standard_EXPORT Handle(Graphic3d_Structure) Compute (const Handle(Graphic3d_DataStructureManager)& aProjector) Standard_OVERRIDE;
+  Standard_EXPORT virtual Handle(Graphic3d_Structure) Compute (const Handle(Graphic3d_DataStructureManager)& aProjector) Standard_OVERRIDE;
   
   //! the "degenerated" Structure is displayed with
   //! a transformation defined by <AMatrix>
@@ -48,25 +47,23 @@ public:
   //! We have to take in account this Transformation
   //! in the computation of hidden line removal...
   //! returns a filled Graphic Structure.
-  Standard_EXPORT Handle(Graphic3d_Structure) Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
-                                                       const Handle(Geom_Transformation)& theTrsf) Standard_OVERRIDE;
+  Standard_EXPORT virtual Handle(Graphic3d_Structure) Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
+                                                               const Handle(Geom_Transformation)& theTrsf) Standard_OVERRIDE;
 
   //! No need to return a structure, just to fill
   //! <ComputedStruct> ....
-  Standard_EXPORT void Compute (const Handle(Graphic3d_DataStructureManager)& aProjector, Handle(Graphic3d_Structure)& ComputedStruct) Standard_OVERRIDE;
+  Standard_EXPORT virtual void Compute (const Handle(Graphic3d_DataStructureManager)& aProjector, Handle(Graphic3d_Structure)& ComputedStruct) Standard_OVERRIDE;
   
   //! No Need to return a Structure, just to
   //! Fill <aStructure>. The Trsf has to be taken in account
   //! in the computation (Rotation Part....)
-  Standard_EXPORT void Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
-                                const Handle(Geom_Transformation)& theTrsf,
-                                Handle(Graphic3d_Structure)& theStructure) Standard_OVERRIDE;
-
-  DEFINE_STANDARD_RTTIEXT(PrsMgr_Prs,Prs3d_Presentation)
+  Standard_EXPORT virtual void Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
+                                        const Handle(Geom_Transformation)& theTrsf,
+                                        Handle(Graphic3d_Structure)& theStructure) Standard_OVERRIDE;
 
 private:
 
-  PrsMgr_PresentationPointer myPresentation3d;
+  PrsMgr_Presentation* myPresentation3d;
 
 };