X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetminipage.h;h=e46de56167fbc2263ae4946be2709e6f69e2b040;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=e324f27a3efba19168a0d3b192ca0103e967e017;hpb=2f8ddf78eaf11e68eb31b56d2ef0a934782119c4;p=lyx.git

diff --git a/src/insets/insetminipage.h b/src/insets/insetminipage.h
index e324f27a3e..e46de56167 100644
--- a/src/insets/insetminipage.h
+++ b/src/insets/insetminipage.h
@@ -17,7 +17,7 @@
 #endif
 
 #include "insetcollapsable.h"
-#include "vspace.h"
+#include "lyxlength.h"
 #include <sigc++/signal_system.h>
 
 /** The minipage inset
@@ -41,25 +41,27 @@ public:
 	///
 	InsetMinipage();
 	///
+	InsetMinipage(InsetMinipage const &, bool same_id = false);
+	///
 	~InsetMinipage();
 	///
-	void Write(Buffer const * buf, std::ostream & os) const;
+	void write(Buffer const * buf, std::ostream & os) const;
 	///
-	void Read(Buffer const * buf, LyXLex & lex);
+	void read(Buffer const * buf, LyXLex & lex);
 	///
-	Inset * Clone(Buffer const &) const;
+	Inset * clone(Buffer const &, bool same_id = false) const;
 	///
 	int ascent(BufferView *, LyXFont const &) const;
 	///
 	int descent(BufferView *, LyXFont const &) const;
 	///
-	Inset::Code LyxCode() const { return Inset::MINIPAGE_CODE; }
+	Inset::Code lyxCode() const { return Inset::MINIPAGE_CODE; }
 	///
-	int Latex(Buffer const *, std::ostream &, bool fragile, bool fp) const;
+	int latex(Buffer const *, std::ostream &, bool fragile, bool fp) const;
 	///
-	string const EditMessage() const;
+	string const editMessage() const;
 	///
-	bool InsertInsetAllowed(Inset * inset) const;
+	bool insetAllowed(Inset::Code) const;
 	///
 	Position pos() const;
 	///
@@ -69,40 +71,33 @@ public:
 	///
 	void innerPos(InnerPosition);
 	///
-	string const & height() const;
-	///
-	void height(string const &);
-	///
-	string const & width() const;
-	///
-	void width(string const &);
+	LyXLength const & pageHeight() const;
 	///
-	int widthp() const;
+	void pageHeight(LyXLength const &);
 	///
-	void widthp(int);
+	LyXLength const & pageWidth() const;
 	///
-	void widthp(string const &);
+	void pageWidth(LyXLength const &);
 	///
 	SigC::Signal0<void> hideDialog;
 	///
-	void InsetButtonRelease(BufferView * bv, int x, int y, int button);
-	///
-	int getMaxWidth(Painter &, UpdatableInset const *) const;
+	int getMaxWidth(BufferView *, UpdatableInset const *) const;
 	///
 	bool needFullRow() const { return false; }
 	///
-	bool ShowInsetDialog(BufferView *) const;
+	bool showInsetDialog(BufferView *) const;
+	///
+	int latexTextWidth(BufferView *) const;
+
 private:
 	///
 	Position pos_;
 	///
 	InnerPosition inner_pos_;
 	///
-	string height_;
-	///
-	string width_;
+	LyXLength height_;
 	///
-	int widthp_;
+	LyXLength width_;
 };
 
 #endif