Import Geant4 7.1.0 source tree

source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4OpenGLStoredXmViewer.cc,v 1.9 2004/04/07 15:18:23 gbarrand Exp $
-// GEANT4 tag $Name: geant4-07-00-cand-01 $
+// $Id: G4OpenGLStoredXmViewer.cc,v 1.11 2005/06/02 17:43:46 allison Exp $
+// GEANT4 tag $Name: geant4-07-01 $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -36,12 +36,12 @@
 #include "G4ios.hh"
 
 G4OpenGLStoredXmViewer::
-G4OpenGLStoredXmViewer (G4OpenGLStoredSceneHandler& scene,
+G4OpenGLStoredXmViewer (G4OpenGLStoredSceneHandler& sceneHandler,
 			const G4String& name)
- : G4VViewer (scene, scene.IncrementViewCount (), name),
-   G4OpenGLViewer (scene),
-   G4OpenGLXmViewer (scene),
-   G4OpenGLStoredViewer (scene)
+ : G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name),
+   G4OpenGLViewer (sceneHandler),
+   G4OpenGLXmViewer (sceneHandler),
+   G4OpenGLStoredViewer (sceneHandler)
 {
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -59,8 +59,8 @@ G4OpenGLStoredXmViewer::~G4OpenGLStoredXmViewer () {}
 void G4OpenGLStoredXmViewer::Initialise () {
 
   CreateGLXContext (vi_stored);
-
   CreateMainWindow ();
+  CreateFontLists ();
 
   InitializeGLView ();