Changeset 1256 for trunk


Ignore:
Timestamp:
May 20, 2010, 11:48:23 AM (14 years ago)
Author:
garnier
Message:

remove cycle dependency

Location:
trunk/source/intercoms
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/intercoms/History

    r1157 r1256  
    1 $Id: History,v 1.77 2009/11/06 09:00:02 kmura Exp $
     1$Id: History,v 1.79 2010/05/19 14:50:30 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     2019 May 2010 L. Garnier
     21 - G4UIManager : Add field to get GUI Window session
     22
     2318 May, 2010 K.Murakami (intercoms-V09-03-00)
     24 - add used characters to tokenNum in G4UItokenNum
     25   for suppressing compiler warnings of gcc 4.5
    1926
    20276 November, 2009 K. Murakami (intercoms-V09-02-02)

  • trunk/source/intercoms/include/G4UImanager.hh

    r1228 r1256  
    2525//
    2626//
    27 // $Id: G4UImanager.hh,v 1.21 2006/06/29 19:08:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4UImanager.hh,v 1.22 2010/05/19 14:50:30 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    144144      G4UIcommandTree * treeTop;
    145145      G4UIsession * session;
     146      G4UIsession * g4UIWindow;
    146147      G4UIcontrolMessenger * UImessenger;
    147148      G4UnitsMessenger * UnitsMessenger;
    … …  
    198199      inline G4UIsession * GetSession() const
    199200      { return session; }
     201      inline G4UIsession * GetG4UIWindow() const
     202      { return g4UIWindow; }
    200203  public: // with description
    201204      inline void SetSession(G4UIsession *const value)
    202205      { session = value; }
     206      inline void SetG4UIWindow(G4UIsession *const value)
     207      { g4UIWindow = value; }
    203208      //  This method defines the active (G)UI session.
    204209     void SetCoutDestination(G4UIsession *const value);

  • trunk/source/intercoms/include/G4UItokenNum.hh

    r1228 r1256  
    2525//
    2626//
    27 // $Id: G4UItokenNum.hh,v 1.8 2006/06/29 19:08:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4UItokenNum.hh,v 1.9 2010/05/18 07:46:29 kmura Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030// G4UItokenNum.hh
    … …  
    5050  //LOGICALNOT = 268,
    5151  LOGICALOR  = 269,
    52   LOGICALAND = 270
     52  LOGICALAND = 270,
     53  SCAREAMER  = 33,
     54  LPAREN     = 40,
     55  PLUS       = 43,
     56  MINUS      = 45
    5357};
    5458
    … …  
    8488    }
    8589} yystype;
    86  
     90
    8791#endif

  • trunk/source/intercoms/src/G4UImanager.cc

    r1228 r1256  
    2525//
    2626//
    27 // $Id: G4UImanager.cc,v 1.33 2007/07/16 10:14:36 kmura Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4UImanager.cc,v 1.34 2010/05/19 14:50:30 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    7474  saveHistory = false;
    7575  session = NULL;
     76  g4UIWindow = NULL;
    7677  SetCoutDestination(session);
    7778  pauseAtBeginOfEvent = false;
Note: See TracChangeset for help on using the changeset viewer.