* Lazy MathData to avoid unneeded interpretation of macro definitions

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

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 3f3b43b73f7d2f06b75a905993feab0bb36c1438..3ae2c6946e5a06aa892c0f43d697822d91013e2b 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -64,7 +64,9 @@ public:
        ///
        virtual docstring const editMessage() const;
        ///
-       InsetBase::Code lyxCode() const { return InsetBase::BOX_CODE; }
+       InsetCode lyxCode() const { return BOX_CODE; }
+       ///
+       docstring name() const;
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
@@ -72,11 +74,11 @@ public:
        ///
        void setButtonLabel();
        ///
-       bool metrics(MetricsInfo &, Dimension &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        /// show the Box dialog
        bool showInsetDialog(BufferView * bv) const;
        ///
-       bool display() const { return false; }
+       DisplayType display() const { return Inline; }
        ///
        bool forceDefaultParagraphs(idx_type) const;
        ///
@@ -84,6 +86,8 @@ public:
        ///
        bool noFontChange() const { return true; }
        ///
+       bool isMacroScope(Buffer const & buf) const;
+       ///
        int latex(Buffer const &, odocstream &, OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
@@ -99,9 +103,11 @@ public:
        enum BoxType {
                Frameless,
                Boxed,
+               Framed,
                ovalbox,
                Ovalbox,
                Shadowbox,
+               Shaded,
                Doublebox
        };
 protected:
@@ -112,7 +118,7 @@ protected:
 private:
        friend class InsetBoxParams;
 
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual Inset * clone() const;
 
        /// used by the constructors
        void init();
@@ -126,7 +132,7 @@ public:
        ///
        InsetBoxMailer(InsetBox & inset);
        ///
-       virtual InsetBase & inset() const { return inset_; }
+       virtual Inset & inset() const { return inset_; }
        ///
        virtual std::string const & name() const { return name_; }
        ///