architectural changes to tex2lyx

[lyx.git] / src / mathed / math_fboxinset.h

diff --git a/src/mathed/math_fboxinset.h b/src/mathed/math_fboxinset.h
index abed52a472a4f9e4de298979b7f4e286a57f4baa..791688bc9da381bf23622a34e01102b8944fb422 100644 (file)
--- a/src/mathed/math_fboxinset.h
+++ b/src/mathed/math_fboxinset.h
@@ -3,11 +3,8 @@
 #define MATH_FBOXINSET_H
 
 #include "math_nestinset.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** Extra nesting
  *  \author André Pönitz
@@ -22,13 +19,13 @@ public:
        ///
        MathFboxInset(latexkeys const * key);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        mode_type currentMode() const;
        ///
-       void metrics(MathMetricsInfo & mi) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void draw(MathPainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
        void write(WriteStream & os) const;
        /// write normalized content