This should be the last of the commits refactoring the InsetLayout code.

[lyx.git] / src / insets / InsetWrap.h

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index c2ec7d9716a3cea410d65d8b7de0dd6370d21e1f..4a0c306a6be5470cd1180aee8109111437d9a178 100644 (file)
--- a/src/insets/InsetWrap.h
+++ b/src/insets/InsetWrap.h
@@ -30,8 +30,12 @@ public:
        ///
        std::string type;
        ///
+       int lines;
+       ///
        std::string placement;
        ///
+       Length overhang;
+       ///
        Length width;
 };
 
@@ -51,7 +55,9 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset::Code lyxCode() const { return Inset::WRAP_CODE; }
+       InsetCode lyxCode() const { return WRAP_CODE; }
+       ///
+       bool isMacroScope(Buffer const &) const { return true; }
        ///
        int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
@@ -64,22 +70,22 @@ public:
        ///
        virtual docstring const editMessage() const;
        ///
-       bool insetAllowed(Inset::Code) const;
-       ///
-       void addToToc(TocList &, Buffer const &) const;
+       bool insetAllowed(InsetCode) const;
        ///
        bool showInsetDialog(BufferView *) const;
        ///
        InsetWrapParams const & params() const { return params_; }
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+       // Update the counters of this inset and of its contents
+       virtual void updateLabels(Buffer const &, ParIterator const &);
 protected:
        ///
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        virtual docstring name() const { return name_; }
 private:
-       virtual std::auto_ptr<Inset> doClone() const;
+       virtual Inset * clone() const;
 
        ///
        InsetWrapParams params_;