Changeset 1256 for trunk/source/intercoms/include

Timestamp:

May 20, 2010, 11:48:23 AM (16 years ago)

Author:

garnier

Message:

remove cycle dependency

Location:

trunk/source/intercoms/include

Files:

• G4UImanager.hh (modified) (3 diffs)
• G4UItokenNum.hh (modified) (3 diffs)

trunk/source/intercoms/include/G4UImanager.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4UImanager.hh,v 1.21 2006/06/29 19:08:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4UImanager.hh,v 1.22 2010/05/19 14:50:30 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 
@@ -144 +144 @@
       G4UIcommandTree * treeTop;
       G4UIsession * session;
+      G4UIsession * g4UIWindow;
       G4UIcontrolMessenger * UImessenger;
       G4UnitsMessenger * UnitsMessenger;
@@ -198 +199 @@
       inline G4UIsession * GetSession() const
       { return session; }
+      inline G4UIsession * GetG4UIWindow() const
+      { return g4UIWindow; }
   public: // with description
       inline void SetSession(G4UIsession *const value)
       { session = value; }
+      inline void SetG4UIWindow(G4UIsession *const value)
+      { g4UIWindow = value; }
       //  This method defines the active (G)UI session.
      void SetCoutDestination(G4UIsession *const value);

trunk/source/intercoms/include/G4UItokenNum.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4UItokenNum.hh,v 1.8 2006/06/29 19:08:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4UItokenNum.hh,v 1.9 2010/05/18 07:46:29 kmura Exp $
+// GEANT4 tag $Name:  $
 //
 // G4UItokenNum.hh
@@ -50 +50 @@
   //LOGICALNOT = 268,
   LOGICALOR  = 269,
-  LOGICALAND = 270
+  LOGICALAND = 270,
+  SCAREAMER  = 33,
+  LPAREN     = 40,
+  PLUS       = 43,
+  MINUS      = 45
 };
 
@@ -84 +88 @@
     }
 } yystype;
- 
+
 #endif