Import Geant4 5.0.0 source tree

2016-06-08 16:57:27 +02:00
parent 330b82b769
commit 37fff30d2e
5733 changed files with 263867 additions and 74574 deletions
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.3 2002/03/01 00:29:39 johna Exp $
+# $Id: GNUmakefile,v 1.4 2002/11/11 18:02:04 johna Exp $

 name := G4OpenGL

@@ -21,5 +21,7 @@ CPPFLAGS += -I$(G4BASE)/geometry/management/include
 CPPFLAGS += -I$(G4BASE)/geometry/volumes/include
 CPPFLAGS += -I$(G4BASE)/intercoms/include
 CPPFLAGS += -I$(G4BASE)/interfaces/common/include
+CPPFLAGS += -I$(G4BASE)/tracking/include
+CPPFLAGS += -I$(G4BASE)/digits+hits/hits/include

 include $(G4INSTALL)/config/common.gmk
@@ -1,4 +1,4 @@
-$Id: History,v 1.16 2002/02/24 01:47:46 johna Exp $
+$Id: History,v 1.23 2002/11/27 12:46:55 johna Exp $
 -------------------------------------------------------------------

     =========================================================
@@ -20,6 +20,27 @@ committal in the CVS repository !
 History file for visualization/OpenGL
 -------------------------------------

+27th November 2002  John Allison  (vis-V04-01-08)
+- Improved algorithm of CompareForKernelVisit.
+
+11th November 2002  John Allison  (opengl-V04-01-02)
+- Corrected inclusion of G4OpenGLXViewer #ifdef X_DRIVER.
+- Added G4OpenGLSceneHandler::AddThis for trajectories and hits - simply
+  call default but there as a marker and encourager.
+- Added tracking and digits+hits/hits to GNUmakefile.
+
+16th October 2002  John Allison  (opengl-V04-01-01)
+- Fix for WIN32.  Now compiles but viewer not implemented.
+
+24th June 2002  John Allison  (opengl-V04-01-00)
+- Further cosmetic changes in G4OpenGLXViewer.cc for DEC compiler.
+
+10th June 2002  John Allison  (opengl-V04-00-03)
+- Cosmetic changes for SUN-CC in G4OpenGLXmConvenienceRoutines.cc.
+
+6th June 2002  John Allison  (opengl-V04-00-02)
+- Cosmetic changes for GNU compiler in G4OpenGLXViewer.cc.
+
 23rd February 2002  John Allison  (opengl-V04-00-01)
 - Changes to encourage compilation on Windows in preparation for
  implementation of G4OpenGLWin32Viewer.  Removed spurious includes of
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateSceneHandler.hh,v 1.6 2001/08/09 20:16:56 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLImmediateViewer.hh,v 1.6 2001/07/11 10:08:48 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLImmediateViewer.hh,v 1.7 2002/10/16 10:44:13 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -49,9 +49,6 @@ class G4OpenGLImmediateViewer: virtual public G4OpenGLViewer {
  
 public:
  G4OpenGLImmediateViewer (G4OpenGLImmediateSceneHandler& scene);
-  
-private:
-  G4OpenGLImmediateSceneHandler&          fSceneHandler; // Graphics Scene for this view.
 };

 #endif
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLImmediateWin32.hh,v 1.5 2001/07/11 10:08:48 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLImmediateWin32.hh,v 1.6 2002/10/16 10:44:14 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // OpenGLImmediateWin32 graphics system factory.
@@ -37,8 +37,8 @@
 class G4OpenGLImmediateWin32: public G4VGraphicsSystem {
 public:
  G4OpenGLImmediateWin32 ();
-  G4VSceneHandler* CreateSceneHandler ();
-  G4VViewer*  CreateViewer  (G4VSceneHandler&);
+  G4VSceneHandler* CreateSceneHandler (const G4String& name = "");
+  G4VViewer*  CreateViewer  (G4VSceneHandler&, const G4String& name = "");
 };

 #endif
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.6 2001/07/14 21:47:41 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.7 2002/10/16 10:44:14 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Class G4OpenGLImmediateWin32Viewer : a class derived from
@@ -45,7 +45,8 @@ class G4OpenGLImmediateWin32Viewer:
 public G4OpenGLWin32Viewer, public G4OpenGLImmediateViewer{
  
 public:
-  G4OpenGLImmediateWin32Viewer (G4OpenGLImmediateSceneHandler& scene);
+  G4OpenGLImmediateWin32Viewer (G4OpenGLImmediateSceneHandler& scene,
+				const G4String& name = "");
  void Initialise ();
  void DrawView ();
 };
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateX.hh,v 1.6 2001/07/11 10:08:48 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateXViewer.hh,v 1.7 2001/07/14 21:47:42 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateXm.hh,v 1.6 2001/07/11 10:08:49 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateXmViewer.hh,v 1.7 2001/07/14 21:47:43 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLSceneHandler.hh,v 1.11 2002/02/24 01:47:49 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLSceneHandler.hh,v 1.12 2002/11/11 18:08:21 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -71,6 +71,8 @@ public:
  void AddThis (const G4Polycone&);
  void AddThis (const G4Polyhedra&);
  void AddThis (const G4VSolid&);
+  void AddThis (const G4VTrajectory&);
+  void AddThis (const G4VHit&);

 protected:
  G4OpenGLSceneHandler (G4VGraphicsSystem& system,
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLSceneHandler.icc,v 1.5 2001/08/09 20:16:06 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  20th January 1998
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.13 2001/08/14 18:03:14 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredViewer.hh,v 1.8 2001/08/14 18:03:15 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLStoredWin32.hh,v 1.5 2001/07/11 10:08:50 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLStoredWin32.hh,v 1.6 2002/10/16 10:44:14 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // OpenGLStoredWin32 graphics system factory.
@@ -37,8 +37,8 @@
 class G4OpenGLStoredWin32: public G4VGraphicsSystem {
 public:
  G4OpenGLStoredWin32 ();
-  G4VSceneHandler* CreateSceneHandler ();
-  G4VViewer*  CreateViewer  (G4VSceneHandler&);
+  G4VSceneHandler* CreateSceneHandler (const G4String& name = "");
+  G4VViewer*  CreateViewer  (G4VSceneHandler&, const G4String& name = "");
 };

 #endif
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLStoredWin32Viewer.hh,v 1.4 2001/07/14 21:47:45 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLStoredWin32Viewer.hh,v 1.5 2002/10/16 10:44:14 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Class G4OpenGLStoredWin32Viewer : a class derived from
@@ -43,7 +43,8 @@ class G4OpenGLStoredWin32Viewer:
 public G4OpenGLWin32Viewer, public G4OpenGLStoredViewer{
  
 public:
-  G4OpenGLStoredWin32Viewer (G4OpenGLStoredSceneHandler& scene);
+  G4OpenGLStoredWin32Viewer (G4OpenGLStoredSceneHandler& scene,
+			     const G4String& name = "");
  void Initialise ();
  void DrawView ();
 };
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredX.hh,v 1.6 2001/07/11 10:08:50 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredXViewer.hh,v 1.5 2001/07/14 21:47:46 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredXm.hh,v 1.5 2001/07/11 10:08:50 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredXmViewer.hh,v 1.5 2001/07/14 21:47:47 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLTransform3D.hh,v 1.4 2001/07/11 10:08:50 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  24th October 1996
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLViewer.hh,v 1.8 2002/02/24 01:47:51 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLViewer.hh,v 1.9 2002/10/16 10:44:14 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -59,11 +59,6 @@ protected:
    transparency_enabled,   //is alpha blending enabled?
    antialiasing_enabled,   //is antialiasing enabled?
    haloing_enabled;        //is haloing enabled for wireframe?
-
-  G4OpenGLSceneHandler&                    fSceneHandler;  // Graphics Scene for this view.
-
-private:
-  //  G4OpenGLSceneHandler&                    fSceneHandler;  // Graphics Scene for this view.
 };

 class G4OpenGLImmediateSceneHandler;
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLWin32Viewer.hh,v 1.5 2001/07/11 10:08:51 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLWin32Viewer.hh,v 1.6 2002/10/24 15:28:05 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // G4OpenGLWin32Viewer : Class to provide WindowsNT specific
@@ -49,7 +49,7 @@ class G4OpenGLWin32Viewer: virtual public G4OpenGLViewer {

 public:
  G4OpenGLWin32Viewer (G4OpenGLSceneHandler& scene);
-  ~G4OpenGLWin32Viewer ();
+  virtual ~G4OpenGLWin32Viewer ();
  void FinishView ();

 protected:
@@ -21,15 +21,15 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLXViewer.hh,v 1.13 2002/02/24 01:47:52 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLXViewer.hh,v 1.16 2002/11/11 18:12:02 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
 // G4OpenGLXViewer : Class to provide XWindows specific
 //                   functionality for OpenGL in GEANT4

-#ifdef G4VIS_BUILD_OPENGL_DRIVER
+#ifdef G4VIS_BUILD_OPENGLX_DRIVER

 #ifndef G4OPENGLXVIEWER_HH
 #define G4OPENGLXVIEWER_HH
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmBox.hh,v 1.6 2001/07/11 10:08:51 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Box container class
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmFourArrowButtons.hh,v 1.5 2001/07/11 10:08:51 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmFramedBox.hh,v 1.6 2001/07/11 10:08:51 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Framed box container class
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmPushButton.hh,v 1.6 2001/07/11 10:08:51 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Push button class. Inherits from G4OpenGLXmVWidgetComponent
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmRadioButton.hh,v 1.6 2001/07/11 10:08:51 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Radio button class. Inherits from G4OpenGLXmVWidgetComponent
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmResources.hh,v 1.4 2001/07/11 10:08:51 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //
 // Default resources file for GEANT4 OpenGL Motif windows.
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmSeparator.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Separator class. Inherits from G4OpenGLXmVWidgetComponent
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmSliderBar.hh,v 1.6 2001/07/11 10:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmTextField.hh,v 1.6 2001/07/11 10:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Text field class. Inherits from G4OpenGLXmVWidgetComponent
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmTopLevelShell.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Top level shell class
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmVWidgetComponent.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Base class for all Motif component widgets
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmVWidgetContainer.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Base class for all Motif container widgets
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmVWidgetObject.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Virtual base class for all Motif widgets.
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmVWidgetShell.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 //Base class for all Motif window widgets (shells)
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmViewer.hh,v 1.6 2001/07/11 10:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateSceneHandler.cc,v 1.7 2002/02/24 01:47:55 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLImmediateViewer.cc,v 1.5 2002/02/24 01:47:56 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLImmediateViewer.cc,v 1.6 2002/10/16 10:44:15 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -36,8 +36,7 @@

 G4OpenGLImmediateViewer::G4OpenGLImmediateViewer (G4OpenGLImmediateSceneHandler& scene):
 G4VViewer (scene, -1),
-G4OpenGLViewer (scene),
-fSceneHandler (scene)
+G4OpenGLViewer (scene)
 {}

 #endif
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLImmediateWin32.cc,v 1.7 2002/02/24 01:47:58 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLImmediateWin32.cc,v 1.8 2002/10/16 10:44:15 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // OpenGLImmediateWin32 graphics system factory.
@@ -42,16 +42,19 @@ G4OpenGLImmediateWin32::G4OpenGLImmediateWin32 ():
 		     G4VisFeaturesOfOpenGLIWin32 (),
 		     G4VGraphicsSystem::threeD) {}

-G4VSceneHandler* G4OpenGLImmediateWin32::CreateSceneHandler () {
-  G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this);
+G4VSceneHandler* G4OpenGLImmediateWin32::CreateSceneHandler
+(const G4String& name) {
+  G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this, name);
  G4cout << G4OpenGLImmediateSceneHandler::GetSceneCount ()
       << ' ' << fName << " scene handlers extanct." << G4endl;
  return    pScene;
 }

-G4VViewer* G4OpenGLImmediateWin32::CreateViewer (G4VSceneHandler& scene) {
+G4VViewer* G4OpenGLImmediateWin32::CreateViewer
+(G4VSceneHandler& scene, const G4String& name) {
  G4VViewer* pView =
-    new G4OpenGLImmediateWin32Viewer ((G4OpenGLImmediateSceneHandler&) scene);
+    new G4OpenGLImmediateWin32Viewer
+    ((G4OpenGLImmediateSceneHandler&) scene, name);
  if (pView) {
    if (pView -> GetViewId () < 0) {
      G4cerr << "G4OpenGLImmediateWin32::CreateViewer: error flagged by negative"
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.5 2002/02/24 01:48:00 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.6 2002/10/16 10:44:15 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Class G4OpenGLImmediateWin32Viewer : a class derived from G4OpenGLWin32Viewer and
@@ -36,11 +36,13 @@

 #include "G4ios.hh"

-G4OpenGLImmediateWin32Viewer::G4OpenGLImmediateWin32Viewer (G4OpenGLImmediateSceneHandler& scene):
+G4OpenGLImmediateWin32Viewer::G4OpenGLImmediateWin32Viewer
+(G4OpenGLImmediateSceneHandler& scene,
+ const G4String&  name):
 G4OpenGLViewer (scene),
 G4OpenGLWin32Viewer (scene),
 G4OpenGLImmediateViewer (scene),
-G4VViewer (scene, scene.IncrementViewCount ()) {
+G4VViewer (scene, scene.IncrementViewCount (), name) {

  if (fViewId < 0) return;  // In case error in base class instantiation.
 }
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateX.cc,v 1.8 2002/02/24 01:48:02 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateXViewer.cc,v 1.7 2002/02/24 01:48:04 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateXm.cc,v 1.8 2002/02/24 01:48:05 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLImmediateXmViewer.cc,v 1.7 2002/02/24 01:48:07 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLSceneHandler.cc,v 1.15 2002/02/24 01:48:09 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLSceneHandler.cc,v 1.17 2002/12/11 15:57:58 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -93,6 +93,9 @@ const GLubyte G4OpenGLSceneHandler::fStippleMaskHashed [128] = {
 //Method for handling G4Polyline objects (from tracking or wireframe).
 void G4OpenGLSceneHandler::AddPrimitive (const G4Polyline& line)
 {
+  G4int nPoints = line.size ();
+  if (nPoints <= 0) return;
+
  const G4Colour& c = GetColour (line);
  glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());

@@ -103,7 +106,6 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyline& line)
  glDisable (GL_LIGHTING);
  glBegin (GL_LINE_STRIP);

-  G4int nPoints = line.size ();
  for (G4int iPoint = 0; iPoint < nPoints; iPoint++) {
  G4double x, y, z;
    x = line[iPoint].x(); 
@@ -590,4 +592,12 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4NURBS& nurb) {
  gluDeleteNurbsRenderer (gl_nurb);
 }

+void G4OpenGLSceneHandler::AddThis(const G4VTrajectory& traj) {
+  G4VSceneHandler::AddThis(traj);  // For now.
+}
+
+void G4OpenGLSceneHandler::AddThis(const G4VHit& hit) {
+  G4VSceneHandler::AddThis(hit);  // For now.
+}
+
 #endif
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.14 2002/02/24 01:48:11 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.15 2002/11/27 12:44:09 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -122,7 +122,7 @@ void G4OpenGLStoredSceneHandler::EndModeling () {
  if (!fTopPODL) {
    G4cout <<
      "ERROR: G4OpenGLStoredSceneHandler::EndModeling: Failure to allocate"
-      "  display List for fTopPODL - suggest trying OpenGL Immediated mode."
+      "  display List for fTopPODL - try OpenGL Immediated mode."
 	   << G4endl;
  }
  else {
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLStoredViewer.cc,v 1.8 2002/02/24 01:48:12 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLStoredViewer.cc,v 1.9 2002/11/27 12:44:10 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -68,8 +68,6 @@ void G4OpenGLStoredViewer::KernelVisitDecision () {

 G4bool G4OpenGLStoredViewer::CompareForKernelVisit(G4ViewParameters& lastVP) {

-  G4bool need = false;
-
  if (
      (lastVP.GetDrawingStyle ()    != fVP.GetDrawingStyle ())    ||
      (lastVP.GetRepStyle ()        != fVP.GetRepStyle ())        ||
@@ -78,26 +76,26 @@ G4bool G4OpenGLStoredViewer::CompareForKernelVisit(G4ViewParameters& lastVP) {
      (lastVP.IsDensityCulling ()   != fVP.IsDensityCulling ())   ||
      (lastVP.IsCullingCovered ()   != fVP.IsCullingCovered ())   ||
      (lastVP.IsSection ()          != fVP.IsSection ())          ||
-      // No need if section plane changes.
+      // No need to visit kernel if section plane changes.
      (lastVP.IsCutaway ()          != fVP.IsCutaway ())          ||
      (lastVP.GetCutawayPlanes ().size () !=
                                 fVP.GetCutawayPlanes ().size ()) ||
-      // No need if cutaway planes change.
+      // No need to visit kernel if cutaway planes change.
      (lastVP.IsExplode ()          != fVP.IsExplode ())          ||
      (lastVP.GetNoOfSides ()       != fVP.GetNoOfSides ())
      ) {
-    need = true;
+    return true;
  }

-  if (!need && lastVP.IsDensityCulling () &&
+  if (lastVP.IsDensityCulling () &&
      (lastVP.GetVisibleDensity () != fVP.GetVisibleDensity ()))
-    need = true;
+    return true;

-  if (!need && lastVP.IsExplode () &&
+  if (lastVP.IsExplode () &&
      (lastVP.GetExplodeFactor () != fVP.GetExplodeFactor ()))
-    need = true;
+    return true;

-  return need;
+  return false;
 }

 void G4OpenGLStoredViewer::DrawDisplayLists () {
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLStoredWin32.cc,v 1.7 2002/02/24 01:48:14 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLStoredWin32.cc,v 1.8 2002/10/16 10:44:15 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // OpenGLStoredWin32 graphics system factory.
@@ -45,16 +45,18 @@ G4OpenGLStoredWin32::G4OpenGLStoredWin32 ():
 		     G4VisFeaturesOfOpenGLSWin32 (),
 		     G4VGraphicsSystem::threeD) {}

-G4VSceneHandler* G4OpenGLStoredWin32::CreateSceneHandler () {
-  G4VSceneHandler* pScene = new G4OpenGLStoredSceneHandler (*this);
+G4VSceneHandler* G4OpenGLStoredWin32::CreateSceneHandler
+(const G4String& name) {
+  G4VSceneHandler* pScene = new G4OpenGLStoredSceneHandler (*this, name);
  G4cout << G4OpenGLStoredSceneHandler::GetSceneCount ()
       << ' ' << fName << " scene handlers extanct." << G4endl;
  return    pScene;
 }

-G4VViewer* G4OpenGLStoredWin32::CreateViewer (G4VSceneHandler& scene) {
+G4VViewer* G4OpenGLStoredWin32::CreateViewer
+(G4VSceneHandler& scene, const G4String& name) {
  G4VViewer* pView =
-    new G4OpenGLStoredWin32Viewer ((G4OpenGLStoredSceneHandler&) scene);
+    new G4OpenGLStoredWin32Viewer ((G4OpenGLStoredSceneHandler&) scene, name);
  if (pView) {
    if (pView -> GetViewId () < 0) {
      delete pView;
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.5 2002/02/24 01:48:16 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.6 2002/10/16 10:44:16 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Class G4OpenGLStoredWin32Viewer : a class derived from G4OpenGLWin32Viewer and
@@ -36,16 +36,18 @@

 #include "G4ios.hh"

-G4OpenGLStoredWin32Viewer::G4OpenGLStoredWin32Viewer (G4OpenGLStoredSceneHandler& scene):
+G4OpenGLStoredWin32Viewer::G4OpenGLStoredWin32Viewer
+(G4OpenGLStoredSceneHandler& scene,
+ const G4String&  name):
 G4OpenGLViewer (scene),
 G4OpenGLWin32Viewer (scene),
 G4OpenGLStoredViewer (scene),
-G4VViewer (scene, scene.IncrementViewCount ()) {
+G4VViewer (scene, scene.IncrementViewCount (), name) {

  if (fViewId < 0) return;  // In case error in base class instantiation.
 }

-void G4OpenGLStoredWin32Viewer::Initialse () {
+void G4OpenGLStoredWin32Viewer::Initialise () {

  //Check that G4OpenGLWin32Viewer got a double buffered colour visual

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredX.cc,v 1.8 2002/02/24 01:48:17 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredXViewer.cc,v 1.8 2002/02/24 01:48:19 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredXm.cc,v 1.7 2002/02/24 01:48:20 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLStoredXmViewer.cc,v 1.7 2002/02/24 01:48:22 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLTransform3D.cc,v 1.4 2001/07/11 10:08:56 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  24th October 1996
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.13 2002/02/24 01:48:24 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLViewer.cc,v 1.14 2002/10/16 10:44:16 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -51,8 +51,7 @@ G4VViewer (scene, -1),
 white_background (false),
 transparency_enabled (false),
 antialiasing_enabled (false),
-haloing_enabled (false),
-fSceneHandler (scene)
+haloing_enabled (false)
 {
  // Make changes to view parameters for OpenGL...
  fVP.SetAutoRefresh(true);
@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLWin32Viewer.cc,v 1.4 2002/02/24 01:48:26 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLWin32Viewer.cc,v 1.5 2002/10/16 10:44:16 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // G4OpenGLWin32Viewer : Class to provide WindowsNT specific
@@ -58,7 +58,10 @@ void G4OpenGLWin32Viewer::GetWin32Connection () {
 void G4OpenGLWin32Viewer::CreateGLWin32Context () {
 // create a GL context
 // set attributes of window now the GL context has been created
-
+    G4cout <<
+      "ERROR: G4OpenGLWin32Viewer::CreateGLWin32Context:"
+      "\n  **** WIN32 VIEWER NOT YET IMPLEMENTED ****"
+           << G4endl;
 }

 void G4OpenGLWin32Viewer::CreateMainWindow () {
@@ -21,15 +21,15 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLXViewer.cc,v 1.14 2002/02/24 01:48:27 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLXViewer.cc,v 1.18 2002/11/11 18:12:03 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  7th February 1997
 // G4OpenGLXViewer : Class to provide XWindows specific
 //                 functionality for OpenGL in GEANT4

-#ifdef G4VIS_BUILD_OPENGL_DRIVER
+#ifdef G4VIS_BUILD_OPENGLX_DRIVER

 #include "G4OpenGLXViewer.hh"

@@ -97,9 +97,8 @@ static const char* gouraudtriangleEPS[] =
 XVisualInfo*  G4OpenGLXViewer::vi_single_buffer = 0;
 XVisualInfo*  G4OpenGLXViewer::vi_double_buffer = 0;

-extern "C"
-{
-  static Bool WaitForNotify (Display*, XEvent* e, char* arg) {
+extern "C" {
+  Bool G4OpenGLXViewerWaitForNotify (Display*, XEvent* e, char* arg) {
    return (e->type == MapNotify) && (e->xmap.window == (Window) arg);
  }
 }
@@ -268,7 +267,7 @@ void G4OpenGLXViewer::CreateMainWindow () {
  XMapWindow (dpy, win);

 // Wait for window to appear (wait for an "expose" event).
-  XIfEvent (dpy, &event, WaitForNotify, (char*) win);
+  XIfEvent (dpy, &event, G4OpenGLXViewerWaitForNotify, (char*) win);

 // connect the context to a window
  glXMakeCurrent (dpy, win, cx);
@@ -736,15 +735,13 @@ typedef struct _DepthIndex {
  GLfloat depth;
 } DepthIndex;

-extern "C"
-{
-  static int
-  compare(const void *a, const void *b)
+extern "C" {
+  int G4OpenGLXViewercompare(const void *a, const void *b)
  {
    const DepthIndex *p1 = (DepthIndex *) a;
    const DepthIndex *p2 = (DepthIndex *) b;
    GLfloat diff = p2->depth - p1->depth;
-
+    
    if (diff > 0.0) {
      return 1;
    } else if (diff < 0.0) {
@@ -843,7 +840,7 @@ void G4OpenGLXViewer::spewSortedFeedback(FILE * file, GLint size, GLfloat * buff
  assert(item == nprimitives);

  /* Sort the primitives back to front. */
-  qsort(prims, nprimitives, sizeof(DepthIndex), compare);
+  qsort(prims, nprimitives, sizeof(DepthIndex), G4OpenGLXViewercompare);

  /* Understand that sorting by a primitives average depth
     doesn't allow us to disambiguate some cases like self
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmBox.cc,v 1.5 2001/07/11 10:08:56 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Box container class

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.7 2001/11/29 12:14:02 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.9 2002/12/11 15:57:59 johna Exp $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -190,8 +190,7 @@ void G4OpenGLXmViewer::Add_radio_box (char* label_string,
 				    char** button_names,
 				    G4OpenGLXmViewer* pView)
 {
-
-  XmString button_str = XmStringCreateLocalized(""); // ...to
+  XmString button_str = XmStringCreateLocalized((char*) ""); // ...to
  // initialise to something to avoid pedantic warning.
  Arg** args;
  args = new Arg* [num_buttons];
@@ -369,7 +368,7 @@ void G4OpenGLXmViewer::Add_slider_box (char* label_string,
 				     XtCallbackRec** slider_box_callbacks,
 				     Widget* parent_widget)
 {
-  XmString slider_name_str = XmStringCreateLocalized(""); // ...to
+  XmString slider_name_str = XmStringCreateLocalized((char*) ""); // ...to
  // initialise to something to avoid pedantic warning.
  Arg** slider_args;
  slider_args = new Arg*[num_sliders];
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmFourArrowButtons.cc,v 1.4 2001/07/11 10:08:57 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmFramedBox.cc,v 1.5 2001/07/11 10:08:57 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Framed box container class

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.9 2001/07/11 10:08:57 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmPanningCallbacks.cc,v 1.6 2001/07/11 10:08:57 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmPushButton.cc,v 1.5 2001/07/11 10:08:57 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Push button class. Inherits from G4OpenGLXmVWidgetComponent

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmRadioButton.cc,v 1.5 2001/07/11 10:08:57 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Radio button class. Inherits from G4OpenGLXmVWidgetComponent

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmRotationCallbacks.cc,v 1.11 2001/07/11 10:08:57 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmSeparator.cc,v 1.4 2001/07/11 10:08:58 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Separator class. Inherits from G4OpenGLXmVWidgetComponent

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmSliderBar.cc,v 1.5 2001/07/11 10:08:58 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmStyleCallbacks.cc,v 1.6 2001/11/12 18:22:09 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmTextField.cc,v 1.6 2001/07/11 10:08:58 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Text field class. Inherits from G4OpenGLXmVWidgetComponent

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmTopLevelShell.cc,v 1.4 2001/07/11 10:08:58 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Top level shell class

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmVWidgetComponent.cc,v 1.4 2001/07/11 10:08:58 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Base class for all Motif component widgets

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmVWidgetContainer.cc,v 1.4 2001/07/11 10:08:58 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Base class for all Motif container widgets

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmVWidgetObject.cc,v 1.4 2001/07/11 10:08:58 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Virtual base class for all Motif widgets.

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmVWidgetShell.cc,v 1.4 2001/07/11 10:08:58 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 //Base class for all Motif shell widgets

@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmViewer.cc,v 1.11 2002/02/24 01:48:29 johna Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -22,7 +22,7 @@
 //
 //
 // $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.5 2001/07/11 10:08:59 gunter Exp $
-// GEANT4 tag $Name: geant4-04-01 $
+// GEANT4 tag $Name: geant4-05-00 $
 //
 // 
 // Andrew Walkden  16th June 1997