From 535084ef1b6d1d998d0bee51bd8fbf5ca85b0579 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 28 Feb 2013 15:42:54 +0000
Subject: [PATCH] Merge from V6_main 28/02/2013

---
 src/LIGHTGUI/LIGHTGUI_TextPrs.cxx | 6 ++++++
 src/LIGHTGUI/Makefile.am          | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx b/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
index 7e869d1..669fb29 100644
--- a/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
@@ -30,6 +30,8 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Select3D_SensitivePoint.hxx>
 
+#include <Basics_OCCTVersion.hxx>
+
 /*!
   \class LIGHTGUI_TextPrs
   \brief Presentation object for the string line.
@@ -79,14 +81,18 @@ void LIGHTGUI_TextPrs::Compute( const Handle(PrsMgr_PresentationManager3d)& /*pr
                                 const Standard_Integer /*mode*/ )
 {
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup( thePrs );
+#if OCC_VERSION_LARGE <= 0x060504
   aGroup->BeginPrimitives();
+#endif
   Graphic3d_Vertex aTextPos;
   //  aTextPos.SetCoord( myPos.X(), aPos.Y(), aPos.Z() );
   aTextPos.SetCoord( myPos.X(), myPos.Y(), myPos.Z() );
   aGroup->Marker( aTextPos );
   //  aGroup->Text( aNodeIter.Value().ToCString(), aTextPos, aCharSize );
   aGroup->Text( myString, aTextPos, aCharSize );
+#if OCC_VERSION_LARGE <= 0x060504
   aGroup->EndPrimitives();
+#endif
 }
 
 /*!
diff --git a/src/LIGHTGUI/Makefile.am b/src/LIGHTGUI/Makefile.am
index 5ceb8a8..73a544f 100644
--- a/src/LIGHTGUI/Makefile.am
+++ b/src/LIGHTGUI/Makefile.am
@@ -53,6 +53,7 @@ libLIGHT_la_CPPFLAGS = \
 	$(VTK_INCLUDES) \
 	$(CAS_CPPFLAGS) \
 	$(PYTHON_INCLUDES) \
+	$(KERNEL_CXXFLAGS) \
 	$(GUI_CXXFLAGS) \
 	-I$(top_builddir)
 
-- 
2.30.2