0024023: Revamp the OCCT Handle -- general

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

diff --git a/src/OpenGl/OpenGl_GraphicDriver.hxx b/src/OpenGl/OpenGl_GraphicDriver.hxx
index 29ba151..b610f89 100644 (file)
--- a/src/OpenGl/OpenGl_GraphicDriver.hxx
+++ b/src/OpenGl/OpenGl_GraphicDriver.hxx
@@ -17,18 +17,15 @@
 #define _OpenGl_GraphicDriver_HeaderFile
 
 #include <Graphic3d_GraphicDriver.hxx>
-#include <Handle_OpenGl_GraphicDriver.hxx>
 #include <OpenGl_Context.hxx>
 #include <OpenGl_PrinterContext.hxx>
 
 #include <Standard_CString.hxx>
 
-#include <Handle_TColStd_HArray1OfByte.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
+#include <TColStd_HArray1OfByte.hxx>
+#include <TColStd_HArray1OfReal.hxx>
 #include <Quantity_PlaneAngle.hxx>
 #include <Quantity_NameOfColor.hxx>
-#include <Handle_OpenGl_View.hxx>
-#include <Handle_OpenGl_Workspace.hxx>
 
 #include <Aspect_Display.hxx>
 #include <Aspect_DisplayConnection.hxx>
@@ -56,20 +53,20 @@
 #include <Graphic3d_BufferType.hxx>
 #include <NCollection_DataMap.hxx>
 
-class TColStd_Array1OfInteger;
-class TColStd_Array1OfReal;
-class TColStd_Array2OfReal;
-class TColStd_HArray1OfByte;
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_HArray1OfReal.hxx>
+#include <TColStd_Array2OfReal.hxx>
+#include <TColStd_HArray1OfByte.hxx>
+
 class Graphic3d_Vector;
 class Quantity_Color;
 class Graphic3d_Vertex;
 class TCollection_ExtendedString;
 class Image_PixMap;
-class TColStd_HArray1OfReal;
-class Handle(OpenGl_Workspace);
 class OpenGl_Element;
 class OpenGl_Structure;
 class OpenGl_Text;
+class OpenGl_View;
 
 //! Tool class to implement consistent state counter
 //! for objects inside the same driver instance.
@@ -86,6 +83,9 @@ private:
   Standard_Size myCounter;
 };
 
+class OpenGl_GraphicDriver;
+DEFINE_STANDARD_HANDLE(OpenGl_GraphicDriver,Graphic3d_GraphicDriver)
+
 //! This class defines an OpenGl graphic driver
 class OpenGl_GraphicDriver : public Graphic3d_GraphicDriver
 {
@@ -359,7 +359,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_GraphicDriver)
+  DEFINE_STANDARD_RTTI(OpenGl_GraphicDriver, Graphic3d_GraphicDriver)
 
 private: