Changeset 2117 for trunk/MagicSoft/Mars/mmain

Timestamp:

05/16/03 13:11:23 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MStatusDisplay.cc (modified) (5 diffs)
• MStatusDisplay.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -485 +485 @@
 //
 MStatusDisplay::MStatusDisplay(Long_t t)
-: TGMainFrame(gClient->GetRoot(), 1, 1), fTimer(this, t, kTRUE), fStatus(kLoopNone), fLog(&gLog), fLogIdx(-1), fLogTimer(this, 250, kTRUE), fLogBox(NULL)
+: TGMainFrame(gClient->GetRoot(), 1, 1), fTimer(this, t, kTRUE), fStatus(kLoopNone), fLog(&gLog), fLogIdx(-1), fLogTimer(this, 250, kTRUE), fLogBox(NULL), fIsLocked(0)
 {
     gROOT->GetListOfSpecials()->Add(this);
@@ -758 +758 @@
     case kLoopStop:
     case kFileExit:
-        if (id==kFileExit && !TestBit(kIsLocked))
+        if (id==kFileExit && !fIsLocked)
             delete this;
         fStatus = (Status_t)id;
@@ -1075 +1075 @@
 void MStatusDisplay::SetNoContextMenu(Bool_t flag)
 {
+    if (fIsLocked>1)
+        return;
+
     flag ? SetBit(kNoContextMenu) : ResetBit(kNoContextMenu);
     for (int i=1; i<fTab->GetNumberOfTabs(); i++)
@@ -1253 +1256 @@
 void MStatusDisplay::StartUpdate(Int_t millisec)
 {
+    if (fIsLocked>1)
+        return;
+
     if (fTimer.GetTime()<TTime(0))
         return;
@@ -1264 +1270 @@
 void MStatusDisplay::StopUpdate()
 {
+    if (fIsLocked>1)
+        return;
+
     fTimer.Stop();
 }

trunk/MagicSoft/Mars/mmain/MStatusDisplay.h

@@ -72 +72 @@
     FontStruct_t fFont;
 
+    UInt_t fIsLocked;
+
     void AddMenuBar();
     void AddProgressBar();
@@ -100 +102 @@
     void UpdatePSHeader(const TString &name) const;
 
-    enum {
-        kIsLocked = BIT(14)
-    };
 public:
      MStatusDisplay(Long_t t=1000);
@@ -152 +151 @@
      void ClearStatus() { fStatus = kLoopNone; }
 
-     void Lock() { SetBit(kIsLocked); }
-     void UnLock() { ResetBit(kIsLocked); }
+     void Lock() { fIsLocked++; }
+     void UnLock() { if (fIsLocked>0) fIsLocked--; }
 
      Bool_t CheckTabForCanvas(int num) const;