Cleanup bv-dependent variables in InsetCollapsable

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

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index 9bf5a551c3f64b2f1352c1de2e1290117bb5cb29..af1ae53c83b014d1b7a6cc3dcb0822e62ab06c2f 100644 (file)
--- a/src/insets/InsetWrap.h
+++ b/src/insets/InsetWrap.h
@@ -12,9 +12,8 @@
 #ifndef INSETWRAP_H
 #define INSETWRAP_H
 
-#include "InsetCollapsable.h"
+#include "InsetCaptionable.h"
 #include "Length.h"
-#include "MailInset.h"
 
 
 namespace lyx {
@@ -42,13 +41,22 @@ public:
 
 /** The wrap inset
  */
-class InsetWrap : public InsetCollapsable {
+class InsetWrap : public InsetCaptionable {
 public:
        ///
-       InsetWrap(Buffer const &, std::string const &);
+       InsetWrap(Buffer *, std::string const &);
        ///
        ~InsetWrap();
        ///
+       InsetWrapParams const & params() const { return params_; }
+       ///
+       static void string2params(std::string const &, InsetWrapParams &);
+       ///
+       static std::string params2string(InsetWrapParams const &);
+private:
+       ///
+       void setCaptionType(std::string const & type);
+       ///
        void write(std::ostream & os) const;
        ///
        void read(Lexer & lex);
@@ -57,62 +65,35 @@ public:
        ///
        InsetCode lyxCode() const { return WRAP_CODE; }
        ///
-       bool isMacroScope() const { return true; }
+       docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       docstring 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
-       void updateLabels(ParIterator const &);
-protected:
+       /// Update the label
+       void updateBuffer(ParIterator const &, UpdateType);
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       docstring name() const { return name_; }
-private:
-       Inset * clone() const;
-
+       docstring layoutName() const;
        ///
-       InsetWrapParams params_;
-       ///
-       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