InsetBox.cpp: only shaded boxes can have multiple paragraphs when there is no inner box

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

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index 4a0c306a6be5470cd1180aee8109111437d9a178..b1539fc971fe5c294dd97acbf272ee3f939d4c38 100644 (file)
--- a/src/insets/InsetWrap.h
+++ b/src/insets/InsetWrap.h
@@ -14,7 +14,6 @@
 
 #include "InsetCollapsable.h"
 #include "Length.h"
-#include "MailInset.h"
 
 
 namespace lyx {
@@ -45,77 +44,53 @@ public:
 class InsetWrap : public InsetCollapsable {
 public:
        ///
-       InsetWrap(BufferParams const &, std::string const &);
+       InsetWrap(Buffer *, std::string const &);
        ///
        ~InsetWrap();
        ///
-       void write(Buffer const & buf, std::ostream & os) const;
+       InsetWrapParams const & params() const { return params_; }
+       ///
+       static void string2params(std::string const &, InsetWrapParams &);
        ///
-       void read(Buffer const & buf, Lexer & lex);
+       static std::string params2string(InsetWrapParams const &);
+private:
+       ///
+       void write(std::ostream & os) const;
+       ///
+       void read(Lexer & lex);
        ///
        void validate(LaTeXFeatures & features) const;
        ///
        InsetCode lyxCode() const { return WRAP_CODE; }
        ///
-       bool isMacroScope(Buffer const &) const { return true; }
+       docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
-       int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+       int latex(odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+       int plaintext(odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+       int docbook(odocstream &, OutputParams const &) const;
        ///
-       virtual docstring const editMessage() const;
+       docstring xhtml(XHTMLStream &, OutputParams 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);
+       /// Update the counters of this inset and of its contents
+       void updateBuffer(ParIterator const &, UpdateType);
        ///
-       virtual docstring name() const { return name_; }
-private:
-       virtual Inset * clone() const;
-
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       InsetWrapParams params_;
+       docstring name() const;
        ///
-       docstring name_;
-};
+       Inset * clone() const { return new InsetWrap(*this); }
 
-
-class InsetWrapMailer : public MailInset {
-public:
-       ///
-       InsetWrapMailer(InsetWrap & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
        ///
-       virtual std::string const & name() const { return name_; }
-       ///
-       virtual std::string const inset2string(Buffer const &) const;
-       ///
-       static void string2params(std::string const &, InsetWrapParams &);
-       ///
-       static std::string const params2string(InsetWrapParams const &);
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetWrap & inset_;
+       InsetWrapParams params_;
 };
 
-
 } // namespace lyx
 
 #endif