Increment version: 9.1.0

[modules/geom.git] / src / OBJECT / GEOM_Annotation.hxx

diff --git a/src/OBJECT/GEOM_Annotation.hxx b/src/OBJECT/GEOM_Annotation.hxx
index 00fc80986731caa44c8d43aaa8af4f17a2da1a8e..794402491eda8960ba6c2aafdb8c5c752ae985a2 100755 (executable)
--- a/src/OBJECT/GEOM_Annotation.hxx
+++ b/src/OBJECT/GEOM_Annotation.hxx
@@ -27,8 +27,6 @@
 #ifndef GEOM_Annotation_HeaderFile
 #define GEOM_Annotation_HeaderFile
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <AIS_InteractiveObject.hxx>
 #include <Bnd_Box.hxx>
 #include <Font_FontAspect.hxx>
@@ -102,7 +100,7 @@ public:
   //! screen, while its position is a 3D point defined in world's coordinate system.
   Standard_EXPORT void SetIsScreenFixed( const Standard_Boolean theIsFixed );
 
-  //! Retuns value of "screen fixed" positioning mode.
+  //! Returns value of "screen fixed" positioning mode.
   Standard_Boolean GetIsScreenFixed() const { return myIsScreenFixed; }
 
   //! Converts annotation position to screen fixed coordinates and
@@ -124,10 +122,10 @@ public:
   //! Returns attachment point of extension line.
   const gp_Pnt& GetAttachPoint() const { return myAttach; }
 
-  //! Sets shape (annotated shape) that will be used for hilighting.
+  //! Sets shape (annotated shape) that will be used for highlighting.
   Standard_EXPORT void SetHilightShape( const TopoDS_Shape& theShape );
 
-  //! Returns the hilighting shape.
+  //! Returns the highlighting shape.
   const TopoDS_Shape HilightShape() const { return myShape; }
 
 public:
@@ -285,10 +283,10 @@ private:
   gp_Pnt myStartPosition; //!< Position before starting dragging operation.
   Standard_Boolean myIsScreenFixed; //!< Flag indicating whether "screen fixed" positioning mode is turned on or off.
   Standard_Boolean myIsAutoHide; //!< Flag indicating whether "auto-hiding" option is turned on.
-  Standard_Boolean myIsDepthCulling; //!< Flag indiciating whether the "depth culling" is turned on.
+  Standard_Boolean myIsDepthCulling; //!< Flag indicating whether the "depth culling" is turned on.
   HighlightMode myHilightMode; //!< Highlight mode for presentation.
   TCollection_ExtendedString myText; //!< Text string of the label presentation.
-  TopoDS_Shape myShape; //!< Hilighting shape.
+  TopoDS_Shape myShape; //!< Highlighting shape.
 
 private:
 
@@ -363,11 +361,7 @@ public:
     //! \param theMode [in] the display mode.
     virtual void
       HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM,
-#if OCC_VERSION_LARGE > 0x07010001
                        const Handle(Prs3d_Drawer)& theStyle,
-#else                  
-                       const Handle(Graphic3d_HighlightStyle)& theStyle,
-#endif                 
                         const Standard_Integer theMode = 0 ) Standard_OVERRIDE;
 
     //! Removes highlighting from the type of shape.