X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Ffiginset.h;h=178ddf4acf9bd6446d429d2c92284570dc16b8b9;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=d066cc4afb9ed5322288ca1611d81301868c3984;hpb=75c5c8c9e51469822100d70a1ead0d7f8d3f69de;p=lyx.git

diff --git a/src/insets/figinset.h b/src/insets/figinset.h
index d066cc4afb..178ddf4acf 100644
--- a/src/insets/figinset.h
+++ b/src/insets/figinset.h
@@ -1,20 +1,19 @@
 // -*- C++ -*-
 /*
   figinset.h - Figure inset header - part of LyX project
-  (C)1996 by Ivan Schreter
+  Copyright 1996 by Ivan Schreter
   */
 
 #ifndef FIGINSET_H
 #define FIGINSET_H
 
 #include "form1.h"
-#include "buffer.h"
 #include "LString.h"
+#include "buffer.h"
 #include "LaTeXFeatures.h"
 #include "insets/lyxinset.h"
 /* the rest is figure stuff */
 
-
 struct Figref;
 
 ///
@@ -25,34 +24,36 @@ public:
 	///
 	~InsetFig();
 	///
-	int Ascent(LyXFont const & font) const;
+	int ascent(Painter &, LyXFont const & font) const;
 	///
-	int Descent(LyXFont const & font) const;
+	int descent(Painter &, LyXFont const & font) const;
 	///
-	int Width(LyXFont const & font) const;
+	int width(Painter &, LyXFont const & font) const;
 	///
-	void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
+	void draw(Painter &, LyXFont const & font,
+		  int baseline, float & x) const;
 	///
-	void Write(ostream &);
+	void Write(std::ostream &) const;
 	///
 	void Read(LyXLex & lex);
 	///
-	int Latex(ostream &, signed char fragile);
+	int Latex(std::ostream &, bool fragile, bool free_space) const;
 	///
-	int Latex(string & file, signed char fragile);
+	int Ascii(std::ostream &) const;
 	///
-	int Linuxdoc(string & file);
+	int Linuxdoc(std::ostream &) const;
 	///
-	int DocBook(string & file);
+	int DocBook(std::ostream &) const;
 	/// Updates needed features for this inset.
 	void Validate(LaTeXFeatures & features) const;
 
 	/// what appears in the minibuffer when opening
-	char const * EditMessage() const { return _("Opened figure"); }
+	char const * EditMessage() const;
+	
 	///
-	void Edit(int, int);
+	void Edit(BufferView *, int, int, unsigned int);
 	///
-	unsigned char Editable() const;
+	EDITABLE Editable() const;
 	///
 	bool Deletable() const;
 	///
@@ -116,19 +117,21 @@ public:
 	float angle;
 	
 	/// graphics command, latex version
-	string cmd;
+	mutable string cmd;
 	
 	/// Caption for subfigure package
 	string subcaption;
 
 	/// various flags
 	int flags;
-	bool subfigure : 1;
+	///
+	bool subfigure;
 	/// figure reference
 	Figref * figure;
 	/// temporary flags
 	int pflags;
-	bool psubfigure : 1;
+	///
+	bool psubfigure;
 private:
 
 	///
@@ -138,7 +141,7 @@ private:
 	/// recompute screen params
 	void Recompute();
 	/// regenerate \includegraphics{} command
-	void Regenerate();
+	void Regenerate() const;
 	/// regenerate \inlcudegraphics{} command in temporary buffer
 	void TempRegenerate();
 	/// get sizes from .eps file