Changeset 5912 for trunk

Timestamp:

01/20/05 16:18:16 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -40 +40 @@
    * mfbase/MFilterList.cc:
      - added a comment
+
+   * mbase/MStatusDisplay.[h,cc]:
+     - fixed Write to be compatible with root 4.02/00
+     - worked around a problem with reading the DrawOption correctly
+       from a stored status display
 
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1610 +1610 @@
     TVirtualPad *padsav = gPad;
     oldc.cd();
+    gPad = &oldc; // FIXME: Why is this necessary to make GetDrawOption work?
 
     //copy primitives
@@ -1705 +1706 @@
 // Writes the contents of a MStatusDisplay to a file.
 //
-Int_t MStatusDisplay::Write(Int_t num, const char *name, Int_t option, Int_t bufsize)
+Int_t MStatusDisplay::Write(Int_t num, const char *name, Int_t option, Int_t bufsize) const
 {
     if (!gFile)

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -161 +161 @@
      TCanvas *GetCanvas(const TString &name) const;
      TVirtualPad *GetFullPad(const Int_t canvas, const Int_t pad);
-     
+
+     Int_t Write(Int_t num, const char *name="MStatusDisplay", Int_t option=0, Int_t bufsize=0) const;
+
      Int_t Read(const char *name="MStatusDisplay");
      Int_t Write(const char *name="MStatusDisplay", Int_t option=0, Int_t bufsize=0)
@@ -167 +169 @@
          return Write(-1, name, option, bufsize);
      }
-     Int_t Write(Int_t num, const char *name="MStatusDisplay", Int_t option=0, Int_t bufsize=0);
+     Int_t Write(const char *name="MStatusDisplay", Int_t option=0, Int_t bufsize=0) const
+     {
+         return Write(-1, name, option, bufsize);
+     }
 
      Bool_t CdCanvas(const TString &name);