Changeset 2550 for trunk/MagicSoft/Mars/mbase

Timestamp:

11/21/03 17:01:15 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MStatusDisplay.cc (modified) (2 diffs)
• MStatusDisplay.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -560 +560 @@
 //
 MStatusDisplay::MStatusDisplay(Long_t t)
-: TGMainFrame(gClient ? gClient->GetRoot() : NULL, 1, 1), fTab(NULL), fTimer(this, t, kTRUE), fStatus(kLoopNone), fLog(&gLog), fLogIdx(-1), fLogTimer(this, 250, kTRUE), fLogBox(NULL), fIsLocked(0)
-{
+: TGMainFrame(NULL, 1, 1), fTab(NULL), fTimer(this, t, kTRUE), fStatus(kLoopNone), fLog(&gLog), fLogIdx(-1), fLogTimer(this, 250, kTRUE), fLogBox(NULL), fIsLocked(0)
+{
+    // p==NULL means: Take gClient->GetRoot() if not in batch mode
+    // see TGWindow::TGWindow()
+
     //
     // This is a possibility for the user to check whether this
@@ -1383 +1386 @@
 
     gLog << dbg << "MStatusDisplay is on heap: " << (int)IsOnHeap() << endl;
+
+    if (TestBit(kExitLoopOnExit))
+        gSystem->ExitLoop();
+    if (TestBit(kExitLoopOnClose))
+        gSystem->ExitLoop();
 
     if (fIsLocked<=0 && IsOnHeap())

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -53 +53 @@
         kSearch
     } Status_t;
+
+    enum
+    {
+        kExitLoopOnExit  = BIT(14),
+        kExitLoopOnClose = BIT(15)
+     };
 
 protected: