Merge V8_4_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a05876834897c1e9095ee79aae1961fa86818091..490d7851d54bcc4c230065599d8ed9bcdc31958c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx b/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
index d07226841067d01b3a91eaea71fce335d8334b73..495181606b995ab6bf1db6e01e40f2fe35f88ab6 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
@@ -36,7 +36,7 @@
   This class is used to display a text line in the OCC 3D viewer.
 */
 
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( LIGHTGUI_TextPrs, AIS_InteractiveObject )
+IMPLEMENT_STANDARD_RTTIEXT( LIGHTGUI_TextPrs, AIS_InteractiveObject )
 
 const Standard_Integer aCharSize = 16;
 

diff --git a/src/LIGHTGUI/LIGHTGUI_TextPrs.h b/src/LIGHTGUI/LIGHTGUI_TextPrs.h
index 872c9fc213c5e45d9053e7a9a14d712af361a463..63b2f41f365504f38d1fa0840edd914a837b29e1 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_TextPrs.h
+++ b/src/LIGHTGUI/LIGHTGUI_TextPrs.h
@@ -29,8 +29,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <Standard_DefineHandle.hxx>
 
-#include <Basics_OCCTVersion.hxx>
-
 class LIGHTGUI_TextPrs: public AIS_InteractiveObject
 {
 public:
@@ -52,7 +50,7 @@ private:
   gp_Pnt             myPos;
 
 public:
-  OCCT_DEFINE_STANDARD_RTTIEXT(LIGHTGUI_TextPrs,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(LIGHTGUI_TextPrs,AIS_InteractiveObject)
 };
 
 DEFINE_STANDARD_HANDLE( LIGHTGUI_TextPrs, AIS_InteractiveObject )