0023544: Texture management in TKOpenGl should be redesigned

[occt.git] / src / OpenGl / OpenGl_AspectText.hxx

diff --git a/src/OpenGl/OpenGl_AspectText.hxx b/src/OpenGl/OpenGl_AspectText.hxx
index 516d278..d7fd9ac 100644 (file)
--- a/src/OpenGl/OpenGl_AspectText.hxx
+++ b/src/OpenGl/OpenGl_AspectText.hxx
@@ -1,13 +1,27 @@
-// File:      OpenGl_AspectText.hxx
-// Created:   13 July 2011
-// Author:    Sergey ZERCHANINOV
-// Copyright: OPEN CASCADE 2011
+// Created on: 2011-07-13
+// Created by: Sergey ZERCHANINOV
+// Copyright (c) 2011-2012 OPEN CASCADE SAS
+//
+// The content of this file is subject to the Open CASCADE Technology Public
+// License Version 6.5 (the "License"). You may not use the content of this file
+// except in compliance with the License. Please obtain a copy of the License
+// at http://www.opencascade.org and read it completely before using this file.
+//
+// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
+// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+//
+// The Original Code and all software distributed under the License is
+// distributed on an "AS IS" basis, without warranty of any kind, and the
+// Initial Developer hereby disclaims all such warranties, including without
+// limitation, any warranties of merchantability, fitness for a particular
+// purpose or non-infringement. Please see the License for the specific terms
+// and conditions governing the rights and limitations under the License.
 
 #ifndef OpenGl_AspectText_Header
 #define OpenGl_AspectText_Header
 
-#include <InterfaceGraphic_telem.hxx>
-#include <OSD_FontAspect.hxx>
+#include <InterfaceGraphic_Graphic3d.hxx>
+#include <Font_FontAspect.hxx>
 #include <Aspect_TypeOfStyleText.hxx>
 #include <Aspect_TypeOfDisplayText.hxx>
 
@@ -15,31 +29,35 @@
 
 class OpenGl_AspectText : public OpenGl_Element
 {
- public:
 
-  OpenGl_AspectText ();
-  virtual ~OpenGl_AspectText ();
+public:
+
+  OpenGl_AspectText();
+  virtual ~OpenGl_AspectText();
 
   void SetContext (const CALL_DEF_CONTEXTTEXT &AContext);
 
   int                      IsZoomable() const { return myZoomable; }
   float                    Angle() const { return myAngle; }
-  OSD_FontAspect           FontAspect() const { return myFontAspect; }
+  Font_FontAspect          FontAspect() const { return myFontAspect; }
   const char *             Font() const { return myFont; }
   const TEL_COLOUR &       Color() const { return myColor; }
   Aspect_TypeOfStyleText   StyleType() const { return myStyleType; }
   Aspect_TypeOfDisplayText DisplayType() const { return myDisplayType; }
   const TEL_COLOUR &       SubtitleColor() const { return mySubtitleColor; }
 
-  virtual void Render (const Handle(OpenGl_Workspace) &AWorkspace) const;
+  virtual void Render  (const Handle(OpenGl_Workspace)& theWorkspace) const;
+  virtual void Release (const Handle(OpenGl_Context)&   theContext);
 
- protected:
+protected:
 
   void SetFontName (const char *AFont);
 
+protected:
+
   int                      myZoomable;
   float                    myAngle;
-  OSD_FontAspect           myFontAspect;
+  Font_FontAspect          myFontAspect;
   const char              *myFont;
   //float                  mySpace;
   //float                  myExpan;
@@ -48,8 +66,10 @@ class OpenGl_AspectText : public OpenGl_Element
   Aspect_TypeOfDisplayText myDisplayType;
   TEL_COLOUR               mySubtitleColor;
 
- public:
-  IMPLEMENT_MEMORY_OPERATORS
+public:
+
+  DEFINE_STANDARD_ALLOC
+
 };
 
 #endif //OpenGl_AspectText_Header