Merge V8_4_BR branch.

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

diff --git a/src/OBJECT/GEOM_Annotation.hxx b/src/OBJECT/GEOM_Annotation.hxx
index e672dd446eedabf147d776b2743aeb0f8c3f6d3f..3594a1b6d6c78d5d81f4a975ecf11bc7558faa3b 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
@@ -363,11 +361,7 @@ public:
     //! \param theMode [in] the display mode.
     virtual void
       HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM,
-#if OCC_VERSION_LARGE > 0x07010000                     
                        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.