Changeset 1278 for trunk/source/interfaces/basic/include/G4UIExecutive.icc

Timestamp:

May 28, 2010, 11:36:37 AM (14 years ago)

Author:

garnier

Message:

bug fix on window

File:

• trunk/source/interfaces/basic/include/G4UIExecutive.icc (modified) (7 diffs)

trunk/source/interfaces/basic/include/G4UIExecutive.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIExecutive.icc,v 1.6 2009/11/20 22:10:31 kmura Exp $
+// $Id: G4UIExecutive.icc,v 1.7 2010/05/28 08:12:27 kmura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -35 +35 @@
 #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)
@@ -45 +45 @@
 #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
@@ -62 +62 @@
 /////////////////////////////////////////////////////
 {
-#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)
@@ -79 +76 @@
   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);
@@ -121 +121 @@
 
 //////////////////////////////////////////////////////////////
-inline void G4UIExecutive::SetLsColor(TermColorIndex dirColor, 
+inline void G4UIExecutive::SetLsColor(TermColorIndex dirColor,
                                       TermColorIndex cmdColor)
 //////////////////////////////////////////////////////////////
@@ -133 +133 @@
 {
   session-> SessionStart();
-  delete session;  
+  delete session;
 }