X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBox.h;h=611647d6f34bdfd23e1bdb2ee44987b654c8e586;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=79a471215412a715505fd53654837ef8c43c6dbf;hpb=73849af5df4d92146bf7c57b489f30d698884401;p=lyx.git

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 79a4712154..611647d6f3 100644
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -64,7 +64,9 @@ public:
 	///
 	virtual docstring const editMessage() const;
 	///
-	Inset::Code lyxCode() const { return Inset::BOX_CODE; }
+	InsetCode lyxCode() const { return BOX_CODE; }
+	///
+	docstring name() const;
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
@@ -72,18 +74,22 @@ public:
 	///
 	void setButtonLabel();
 	///
-	bool metrics(MetricsInfo &, Dimension &) const;
+	void metrics(MetricsInfo &, Dimension &) const;
 	/// show the Box dialog
 	bool showInsetDialog(BufferView * bv) const;
 	///
 	DisplayType display() const { return Inline; }
+	//FIXME Is this the one we want? or is it:
+	//allowParagraphCustomization(idx_type)?
 	///
-	bool forceDefaultParagraphs(idx_type) const;
+	virtual bool forceEmptyLayout() const;
 	///
 	bool neverIndent(Buffer const &) const { return true; }
 	///
 	bool noFontChange() const { return true; }
 	///
+	bool isMacroScope(Buffer const & buf) const;
+	///
 	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
 	int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
@@ -99,9 +105,11 @@ public:
 	enum BoxType {
 		Frameless,
 		Boxed,
+		Framed,
 		ovalbox,
 		Ovalbox,
 		Shadowbox,
+		Shaded,
 		Doublebox
 	};
 protected:
@@ -109,12 +117,10 @@ protected:
 	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 	/// Is the width forced to some value?
 	virtual bool hasFixedWidth() const;
-	///
-	virtual docstring name() const { return from_ascii("Box"); }
 private:
 	friend class InsetBoxParams;
 
-	virtual std::auto_ptr<Inset> doClone() const;
+	virtual Inset * clone() const;
 
 	/// used by the constructors
 	void init();