Hopefully fix the problem with stateText() in lyxfont.C

[lyx.git] / src / mathed / math_root.C

diff --git a/src/mathed/math_root.C b/src/mathed/math_root.C
index bce021dafc23722a4393c3f83e805db77fd806c2..be1853c60f9bfb74ebc6aab02451073f94c584f3 100644 (file)
--- a/src/mathed/math_root.C
+++ b/src/mathed/math_root.C
@@ -6,7 +6,7 @@
  *  Created:     January 1999
  *  Description: Root math object
  *
- *  Copyright: (c) 1999 Alejandro Aguilar Sierra
+ *  Copyright: 1999 Alejandro Aguilar Sierra
  *
  *   You are free to use and modify this code under the terms of
  *   the GNU General Public Licence version 2 or later.
@@ -22,7 +22,10 @@
 #include "math_iter.h"
 #include "math_root.h"
 
-MathRootInset::MathRootInset(short st): MathSqrtInset(st)
+using std::ostream;
+
+MathRootInset::MathRootInset(short st)
+       : MathSqrtInset(st)
 {
     idx = 1;
     uroot = new MathParInset(LM_ST_TEXT); 
@@ -109,7 +112,6 @@ void MathRootInset::Metrics()
 }
 
 
-#ifdef USE_PAINTER
 void MathRootInset::draw(Painter & pain, int x, int y)
 {
     int idxp = idx;
@@ -119,18 +121,6 @@ void MathRootInset::draw(Painter & pain, int x, int y)
     MathSqrtInset::draw(pain, x + wroot, y);
     idx = idxp;
 }
-#else
-void MathRootInset::Draw(int x, int y)
-{
-    int idxp = idx;
-
-    idx = 1;
-    uroot->Draw(x, y - dh);
-    MathSqrtInset::Draw(x+wroot, y);
-    XFlush(fl_display);
-    idx = idxp;
-}
-#endif
 
 
 void MathRootInset::SetStyle(short st)
@@ -147,21 +137,11 @@ void MathRootInset::SetFocus(int x, int)
 }
 
 
-void MathRootInset::Write(ostream & os)
-{ 
-   string output;
-   MathRootInset::Write(output);
-   os << output;
-}
-
-
-void MathRootInset::Write(string &outf)
-{ 
-   outf += '\\';
-   outf += name;
-   outf += '[';
-   uroot->Write(outf);  
-   outf += "]{";
-   MathParInset::Write(outf);
-   outf += '}';
+void MathRootInset::Write(ostream & os, bool fragile)
+{
+       os << '\\' << name << '[';
+       uroot->Write(os, fragile);  
+       os << "]{";
+       MathParInset::Write(os, fragile);
+       os << '}';
 }