Import Geant4 0.1.0 source tree

source/graphics_reps/include/G4VMarker.hh

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VMarker.hh,v 2.3 1998/11/09 02:37:42 stanaka Exp $
-// GEANT4 tag $Name: geant4-00 $
+// $Id: G4VMarker.hh,v 1.4 1999/05/25 09:10:13 johna Exp $
+// GEANT4 tag $Name: geant4-00-01 $
 //
 // 
 // G4VMarker - base class for markers - circles, squares, etc.
@@ -34,9 +34,9 @@
 // Also in G4ViewParameters is a "global marker scale" which is a
 // factor by which all marker sizes are multiplied before drawing.
 //
-// Thus the graphics system driver scene code might look like:
+// Thus the graphics system driver scene handler code might look like:
 //
-// void G4XXXGraphicsScene::AddPrimitive (const G4Circle& circle) {
+// void G4XXXGraphicsSceneHandler::AddPrimitive (const G4Circle& circle) {
 //   G4bool hidden = !(fpView -> GetViewParameters().IsMarkerNotHidden());
 //   const G4Colour&     colour = GetColour (circle);  // Base class GetColour.
 //   G4VMarker::FillStyle style = circle.GetFillStyle();
@@ -68,8 +68,7 @@
 class G4VMarker: public G4VVisPrim {
 
   friend ostream& operator << (ostream& os, const G4VMarker& marker);
-  friend G4bool   operator != (const G4VMarker& m1,
-			       const G4VMarker& m2);
+
 public:
 
   enum FillStyle {noFill, hashed, filled};
@@ -78,9 +77,22 @@ public:
   // Constructors...
   G4VMarker ();
   G4VMarker (const G4VMarker& marker);
-  G4VMarker& operator = (const G4VMarker& right);
   G4VMarker (const G4Point3D& pos);
 
+  //////////////////////////////////////////////////////
+  // Destructor...
+  virtual ~G4VMarker ();
+
+  //////////////////////////////////////////////////////
+  // Assignment...
+  virtual G4Visible&  operator = (const G4Visible& right);
+  virtual G4VVisPrim& operator = (const G4VVisPrim& right);
+  virtual G4VMarker&  operator = (const G4VMarker& right);
+
+  //////////////////////////////////////////////////////
+  // Logical...
+  G4bool operator != (const G4VMarker&) const;
+
   /////////////////////////////////////////////////////
   // Get functions...
   G4Point3D GetPosition       () const;
@@ -104,8 +116,8 @@ public:
   void SetFillStyle      (FillStyle);
 
   // Access functions to the string for user custimizable information
-  virtual   const G4String&  GetInfo() const { return fInfo ;}
-  virtual   void             SetInfo( const G4String& info ){ fInfo = info ;}
+  virtual   const G4String&  GetInfo() const;
+  virtual   void             SetInfo( const G4String& info );
 
 private:
   G4Point3D fPosition;