* Lazy MathData to avoid unneeded interpretation of macro definitions

[features.git] / src / insets / InsetText.h

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index e9d64a55ab75420bf852044dd061c64541477b61..40efd2b7aaeeb632d84b96a9fe1439d25c090298 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -13,14 +13,12 @@
 #define INSETTEXT_H
 
 #include "Inset.h"
-#include "Font.h"
+
+#include "ColorCode.h"
 #include "Text.h"
 
 #include "support/types.h"
 
-#include "frontends/mouse_state.h"
-
-
 namespace lyx {
 
 class Buffer;
@@ -28,7 +26,6 @@ class BufferParams;
 class BufferView;
 class CursorSlice;
 class Dimension;
-class Color_color;
 class ParagraphList;
 class InsetTabular;
 
@@ -44,6 +41,9 @@ public:
        ///
        InsetText();
 
+       ///
+       Dimension const dimension(BufferView const &) const;
+
        /// empty inset to empty par
        void clear();
        ///
@@ -51,7 +51,7 @@ public:
        ///
        void write(Buffer const & buf, std::ostream & os) const;
        ///
-       bool metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -61,9 +61,9 @@ public:
        ///
        bool canTrackChanges() const { return true; }
        ///
-       InsetText * asTextInset() { return this; }
+       InsetText * asInsetText() { return this; }
        ///
-       InsetText const * asTextInset() const { return this; }
+       InsetText const * asInsetText() const { return this; }
        ///
        int latex(Buffer const &, odocstream &, OutputParams const &) const;
        ///
@@ -77,7 +77,7 @@ public:
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
                bool boundary, int & x, int & y) const;
        ///
-       Code lyxCode() const { return TEXT_CODE; }
+       InsetCode lyxCode() const { return TEXT_CODE; }
        ///
        void setText(docstring const &, Font const &, bool trackChanges);
        ///
@@ -87,9 +87,9 @@ public:
        ///
        void setDrawFrame(bool);
        ///
-       Color_color frameColor() const;
+       ColorCode frameColor() const;
        ///
-       void setFrameColor(Color_color);
+       void setFrameColor(ColorCode);
        ///
        bool showInsetDialog(BufferView *) const;
        ///
@@ -124,12 +124,16 @@ public:
        ///
        ParagraphList const & paragraphs() const;
        ///
-       bool insetAllowed(Code) const { return true; }
+       bool insetAllowed(InsetCode) const { return true; }
        ///
        bool allowSpellCheck() const { return true; }
        /// should paragraph indendation be ommitted in any case?
        bool neverIndent(Buffer const &) const;
        ///
+       virtual bool isMacroScope(Buffer const & buf) const { return true; }
+       ///
+       virtual bool allowMultiPar() const { return true; }
+       ///
        InsetText(InsetText const &);
 
        // Update the counters of this inset and of its contents
@@ -147,20 +151,14 @@ private:
 
        ///
        bool drawFrame_;
-       /** We store the Color::color value as an int to get Color.h out
-        *  of the header file.
-        */
-       int frame_color_;
+       ///
+       ColorCode frame_color_;
        ///
        mutable pit_type old_pit;
 
 public:
        ///
        mutable Text text_;
-       ///
-       mutable Font font_;
-       ///
-       static int border_;
 };
 
 } // namespace lyx