This optional argument to the InsetCollapsable constructor

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

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index aa47bec13025f6022ca076abb3fdd278118cb45d..1ad80c570d6452f28c65dbe3f2b6f2664bfb1f39 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 {
@@ -50,6 +49,10 @@ public:
        ~InsetWrap();
        ///
        InsetWrapParams const & params() const { return params_; }
+       ///
+       static void string2params(std::string const &, InsetWrapParams &);
+       ///
+       static std::string params2string(InsetWrapParams const &);
 private:
        ///
        void write(std::ostream & os) const;
@@ -60,7 +63,7 @@ private:
        ///
        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;
        ///
@@ -80,39 +83,16 @@ private:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       docstring name() const { return name_; }
+       docstring getCaptionText(OutputParams const &) const;
+       ///
+       docstring name() const;
        ///
        Inset * clone() const { return new InsetWrap(*this); }
 
        ///
        InsetWrapParams params_;
-       ///
-       docstring name_;
-};
-
-
-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_;
 };
 
-
 } // namespace lyx
 
 #endif