From 6a240ff87d124374201dd1761d703945b9cd88f2 Mon Sep 17 00:00:00 2001 From: osa Date: Wed, 19 Feb 2014 14:17:48 +0400 Subject: [PATCH] 0024641: TKOpenGl - public methods of OpenGl_Text and OpenGl_AspectText classes are not exported --- src/OpenGl/OpenGl_AspectText.hxx | 10 ++++---- src/OpenGl/OpenGl_Text.hxx | 42 ++++++++++++++++---------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/OpenGl/OpenGl_AspectText.hxx b/src/OpenGl/OpenGl_AspectText.hxx index 85d1365c4a..156b637a99 100755 --- a/src/OpenGl/OpenGl_AspectText.hxx +++ b/src/OpenGl/OpenGl_AspectText.hxx @@ -32,11 +32,11 @@ class OpenGl_AspectText : public OpenGl_Element public: - OpenGl_AspectText(); - virtual ~OpenGl_AspectText(); + Standard_EXPORT OpenGl_AspectText(); + Standard_EXPORT virtual ~OpenGl_AspectText(); //! Copy parameters - void SetAspect (const CALL_DEF_CONTEXTTEXT& theAspect); + Standard_EXPORT void SetAspect (const CALL_DEF_CONTEXTTEXT& theAspect); //! @return font family name const TCollection_AsciiString& FontName() const @@ -128,8 +128,8 @@ public: return myResources.ShaderProgram; } - virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const; - virtual void Release (const Handle(OpenGl_Context)& theContext); + Standard_EXPORT virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const; + Standard_EXPORT virtual void Release (const Handle(OpenGl_Context)& theContext); protected: diff --git a/src/OpenGl/OpenGl_Text.hxx b/src/OpenGl/OpenGl_Text.hxx index b0cff5dea8..c8ade80506 100755 --- a/src/OpenGl/OpenGl_Text.hxx +++ b/src/OpenGl/OpenGl_Text.hxx @@ -64,37 +64,37 @@ public: public: //! @name methods for compatibility with layers //! Empty constructor - OpenGl_Text(); + Standard_EXPORT OpenGl_Text(); //! Create key for shared resource - static TCollection_AsciiString FontKey (const OpenGl_AspectText& theAspect, - const Standard_Integer theHeight); + Standard_EXPORT static TCollection_AsciiString FontKey (const OpenGl_AspectText& theAspect, + const Standard_Integer theHeight); //! Find shared resource for specified font or initialize new one - static Handle(OpenGl_Font) FindFont (const Handle(OpenGl_Context)& theCtx, - const OpenGl_AspectText& theAspect, - const Standard_Integer theHeight, - const TCollection_AsciiString theKey); + Standard_EXPORT static Handle(OpenGl_Font) FindFont (const Handle(OpenGl_Context)& theCtx, + const OpenGl_AspectText& theAspect, + const Standard_Integer theHeight, + const TCollection_AsciiString theKey); //! Compute text width - static void StringSize (const Handle(OpenGl_Context)& theCtx, - const NCollection_String& theText, - const OpenGl_AspectText& theTextAspect, - const OpenGl_TextParam& theParams, - Standard_ShortReal& theWidth, - Standard_ShortReal& theAscent, - Standard_ShortReal& theDescent); + Standard_EXPORT static void StringSize (const Handle(OpenGl_Context)& theCtx, + const NCollection_String& theText, + const OpenGl_AspectText& theTextAspect, + const OpenGl_TextParam& theParams, + Standard_ShortReal& theWidth, + Standard_ShortReal& theAscent, + Standard_ShortReal& theDescent); //! Setup new string and parameters - void Init (const Handle(OpenGl_Context)& theCtx, - const TCollection_ExtendedString& theText, - const OpenGl_Vec2& thePoint, - const OpenGl_TextParam& theParams); + Standard_EXPORT void Init (const Handle(OpenGl_Context)& theCtx, + const TCollection_ExtendedString& theText, + const OpenGl_Vec2& thePoint, + const OpenGl_TextParam& theParams); //! Perform rendering - void Render (const Handle(OpenGl_PrinterContext)& thePrintCtx, - const Handle(OpenGl_Context)& theCtx, - const OpenGl_AspectText& theTextAspect) const; + Standard_EXPORT void Render (const Handle(OpenGl_PrinterContext)& thePrintCtx, + const Handle(OpenGl_Context)& theCtx, + const OpenGl_AspectText& theTextAspect) const; protected: