X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.h;h=588a3bc1e16aee37b793ef86a68039a9589df6d9;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=aa47bec13025f6022ca076abb3fdd278118cb45d;hpb=75999ba650ec5cb40ae31aae4ea1eb817929d09b;p=lyx.git

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index aa47bec130..588a3bc1e1 100644
--- 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,15 +41,21 @@ 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;
 	///
@@ -60,59 +65,37 @@ 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;
+	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;
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
-	// Update the counters of this inset and of its contents
-	void updateLabels(ParIterator const &);
+	/// Update the label
+	void updateBuffer(ParIterator const &, UpdateType);
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
-	docstring name() const { return name_; }
+	docstring layoutName() const;
 	///
 	Inset * clone() const { return new InsetWrap(*this); }
+	/// Is the content of this inset part of the immediate (visible) text sequence?
+	bool isPartOfTextSequence() const { return false; }
 
 	///
 	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