macro rework

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

diff --git a/src/mathed/math_boxinset.h b/src/mathed/math_boxinset.h
index 07f3440d96349a48861c0e45891e3d664468d4b5..c155a76301cd3d4a0294dd8af8d69777cb133c44 100644 (file)
--- a/src/mathed/math_boxinset.h
+++ b/src/mathed/math_boxinset.h
@@ -1,34 +1,38 @@
 // -*- C++ -*-
+/**
+ * \file math_boxinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_BOXINSET_H
 #define MATH_BOXINSET_H
 
-#include "math_gridinset.h"
-#include "LString.h"
+#include "math_nestinset.h"
+
+#include <string>
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 class LyXFont;
 
 /// Support for \\mbox
 
-class MathBoxInset : public MathGridInset {
+class MathBoxInset : public MathNestInset {
 public:
        ///
-       explicit MathBoxInset(string const & name);
+       explicit MathBoxInset(std::string const & name);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       void metrics(MathMetricsInfo & mi) const;
+       mode_type currentMode() const { return TEXT_MODE; }
        ///
-       void draw(MathPainterInfo & pi, int x, int y) const;
-       /// identifies BoxInsets
-       MathBoxInset * asBoxInset() { return this; }
-       /// identifies BoxInsets
-       MathBoxInset const * asBoxInset() const { return this; }
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void rebreak();
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
        void write(WriteStream & os) const;
        ///
@@ -38,9 +42,7 @@ public:
 
 private:
        ///
-       mutable MathMetricsInfo mi_;
-       ///
-       string name_;
+       std::string name_;
 };