X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbox.h;h=8786c1c649efb1301eeaec92995e0f9d7ddc9f63;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=3e0df69ebb2f205fe8d488a135ad264d8d9ba8be;hpb=85dc2d3ebda7b42f50101306513a44029fe38f00;p=lyx.git

diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h
index 3e0df69ebb..8786c1c649 100644
--- a/src/insets/insetbox.h
+++ b/src/insets/insetbox.h
@@ -13,11 +13,13 @@
 #ifndef INSETBOX_H
 #define INSETBOX_H
 
-
 #include "insetcollapsable.h"
 #include "lyxlength.h"
+#include "mailinset.h"
 
 
+namespace lyx {
+
 class InsetBoxParams {
 public:
 	///
@@ -60,7 +62,7 @@ public:
 	///
 	~InsetBox();
 	///
-	std::string const editMessage() const;
+	virtual docstring const editMessage() const;
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::BOX_CODE; }
 	///
@@ -70,7 +72,7 @@ public:
 	///
 	void setButtonLabel();
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	/// show the Box dialog
 	bool showInsetDialog(BufferView * bv) const;
 	///
@@ -78,20 +80,15 @@ public:
 	///
 	bool forceDefaultParagraphs(idx_type) const;
 	///
-	bool neverIndent() const { return true; }
+	bool neverIndent(Buffer const &) const { return true; }
 	///
 	bool noFontChange() const { return true; }
 	///
-	int latex(Buffer const &, std::ostream &,
-			OutputParams const &) const;
-	///
-	int linuxdoc(Buffer const &, std::ostream &,
-		     OutputParams const &) const;
+	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &,
-		    OutputParams const &) const;
+	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, std::ostream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const & runparams) const;
 	///
 	void validate(LaTeXFeatures &) const;
@@ -111,6 +108,8 @@ public:
 protected:
 	InsetBox(InsetBox const &);
 	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+	/// Is the width forced to some value?
+	virtual bool hasFixedWidth() const;
 private:
 	friend class InsetBoxParams;
 
@@ -123,8 +122,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetBoxMailer : public MailInset {
 public:
 	///
@@ -147,4 +144,7 @@ private:
 	InsetBox & inset_;
 };
 
+
+} // namespace lyx
+
 #endif // INSET_BOX_H