0031990: Coding, Draw Harness - Replace C-like pointers to function in Draw_SaveAndRe...

[occt.git] / src / Draw / Draw_Number.hxx

diff --git a/src/Draw/Draw_Number.hxx b/src/Draw/Draw_Number.hxx
index 162f0a2..9927258 100644 (file)
--- a/src/Draw/Draw_Number.hxx
+++ b/src/Draw/Draw_Number.hxx
@@ -17,68 +17,45 @@
 #ifndef _Draw_Number_HeaderFile
 #define _Draw_Number_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <Standard_Real.hxx>
 #include <Draw_Drawable3D.hxx>
-#include <Standard_OStream.hxx>
-#include <Draw_Interpretor.hxx>
-class Draw_Display;
-class Draw_Drawable3D;
-
 
-class Draw_Number;
 DEFINE_STANDARD_HANDLE(Draw_Number, Draw_Drawable3D)
 
 //! To store numbers in variables.
 class Draw_Number : public Draw_Drawable3D
 {
-
+  DEFINE_STANDARD_RTTIEXT(Draw_Number, Draw_Drawable3D)
+  Draw_Drawable3D_FACTORY
 public:
 
+  Standard_EXPORT Draw_Number (const Standard_Real theV);
+
+  Standard_Real Value() const { return myValue; }
+
+  void Value (const Standard_Real theV) { myValue = theV; }
   
-  Standard_EXPORT Draw_Number(const Standard_Real V);
-  
-  Standard_EXPORT Standard_Real Value() const;
-  
-  Standard_EXPORT void Value (const Standard_Real V);
-  
-  //! Does nothhing,
-  Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
-  
+  //! Does nothing,
+  Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
+
+  //! Returns TRUE if object can be displayed.
+  virtual bool IsDisplayable() const Standard_OVERRIDE { return false; }
+
   //! For variable copy.
   Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
   
   //! For variable dump.
   Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
-  
-  //! For variable whatis command. Set  as a result  the
-  //! type of the variable.
-  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
-
-
-
-
-  DEFINE_STANDARD_RTTIEXT(Draw_Number,Draw_Drawable3D)
-
-protected:
-
 
+  //! Save drawable into stream.
+  Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
 
+  //! For variable whatis command. Set as a result the type of the variable.
+  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
 
 private:
 
-
   Standard_Real myValue;
 
-
 };
 
-
-
-
-
-
-
 #endif // _Draw_Number_HeaderFile