Import Geant4 9.4.0 source tree
This commit is contained in:
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIExecutive.icc,v 1.6 2009/11/20 22:10:31 kmura Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
// $Id: G4UIExecutive.icc,v 1.7 2010/05/28 08:12:27 kmura Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04-beta-01 $
|
||||
//
|
||||
// ====================================================================
|
||||
// G4UIExecutive.icc
|
||||
@@ -34,9 +34,9 @@
|
||||
#include "G4UIsession.hh"
|
||||
#include "G4UImanager.hh"
|
||||
|
||||
#if defined(G4UI_USE_TCSH)
|
||||
#include "G4UIterminal.hh"
|
||||
#include "G4UItcsh.hh"
|
||||
#if defined(G4UI_USE_QT)
|
||||
#include "G4UIQt.hh"
|
||||
#include "G4Qt.hh"
|
||||
|
||||
#elif defined(G4UI_USE_XM)
|
||||
#include "G4UIXm.hh"
|
||||
@@ -44,9 +44,9 @@
|
||||
#elif defined(G4UI_USE_WIN32)
|
||||
#include "G4UIWin32.hh"
|
||||
|
||||
#elif defined(G4UI_USE_QT)
|
||||
#include "G4UIQt.hh"
|
||||
#include "G4Qt.hh"
|
||||
#elif defined(G4UI_USE_TCSH)
|
||||
#include "G4UIterminal.hh"
|
||||
#include "G4UItcsh.hh"
|
||||
|
||||
#else
|
||||
#include "G4UIterminal.hh"
|
||||
@@ -61,12 +61,9 @@ G4UIExecutive::G4UIExecutive(G4int argc, char** argv)
|
||||
: session(0), shell(0),isGUI(false)
|
||||
/////////////////////////////////////////////////////
|
||||
{
|
||||
#if defined(G4UI_USE_TCSH)
|
||||
DISCARD_PARAMETER(argc);
|
||||
DISCARD_PARAMETER(argv);
|
||||
|
||||
shell = new G4UItcsh;
|
||||
session = new G4UIterminal(shell);
|
||||
#if defined(G4UI_USE_QT)
|
||||
session = new G4UIQt(argc, argv);
|
||||
isGUI = true;
|
||||
|
||||
#elif defined(G4UI_USE_XM)
|
||||
session = new G4UIXm(argc, argv);
|
||||
@@ -78,10 +75,13 @@ G4UIExecutive::G4UIExecutive(G4int argc, char** argv)
|
||||
|
||||
session = new G4UIWin32();
|
||||
|
||||
#elif defined(G4UI_USE_QT)
|
||||
session = new G4UIQt(argc, argv);
|
||||
isGUI = true;
|
||||
|
||||
#elif defined(G4UI_USE_TCSH)
|
||||
DISCARD_PARAMETER(argc);
|
||||
DISCARD_PARAMETER(argv);
|
||||
|
||||
shell = new G4UItcsh;
|
||||
session = new G4UIterminal(shell);
|
||||
|
||||
#else
|
||||
DISCARD_PARAMETER(argc);
|
||||
DISCARD_PARAMETER(argv);
|
||||
@@ -120,7 +120,7 @@ inline void G4UIExecutive::SetPrompt(const G4String& prompt)
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////
|
||||
inline void G4UIExecutive::SetLsColor(TermColorIndex dirColor,
|
||||
inline void G4UIExecutive::SetLsColor(TermColorIndex dirColor,
|
||||
TermColorIndex cmdColor)
|
||||
//////////////////////////////////////////////////////////////
|
||||
{
|
||||
@@ -132,6 +132,6 @@ inline void G4UIExecutive::SessionStart()
|
||||
/////////////////////////////////////////
|
||||
{
|
||||
session-> SessionStart();
|
||||
delete session;
|
||||
delete session;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user