Changeset 2180 for trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

Timestamp:

06/16/03 15:13:21 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -675 +675 @@
 
     // layout and map new tab
-#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,00)
+//#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,00)
     MapSubwindows();
     Layout();
-#else
-    Layout();
-    MapSubwindows();
-#endif
+//#else
+//    Layout();
+//    MapSubwindows();
+//#endif
 
     // display new tab in the main frame
@@ -1435 +1435 @@
     const TString newstr("%%DocumentPaperSizes: a4\n%%Orientation: Landscape");
 
-    // gcc 3.2:
-    /*
-    fstream f(name, ios::in|ios::out|ios::nocreate);
+    /* FIXME: Does gcc 2.95 need this flag, too? |ios::nocreate */
+    fstream f(name, ios::in|ios::out);
 
     TString str;
     f >> str;
 
-    streampos p = f.tellg()+1;
+    const streampos p = f.tellg();
 
     char *c1 = new char[newstr.Length()];
@@ -1450 +1449 @@
 
     f.seekp(p);
+    f.seekp(1, ios::cur);
 
     f << newstr;
@@ -1455 +1455 @@
     while (1)
     {
-        streampos p1 = f.tellg();
+        const streampos p1 = f.tellg();
         f.read(c2, newstr.Length());
-        streampos p2 = f.tellg();
+        const streampos p2 = f.tellg();
         f.seekp(p1);
         if (f)
@@ -1474 +1474 @@
     delete c2;
     delete c1;
-    */
 }