prepare for 1.1.6pre2

[lyx.git] / src / insets / figinset.h

diff --git a/src/insets/figinset.h b/src/insets/figinset.h
index 83234badc5c1e6c5eccd6829da9d8c2905517ba0..421a0da786b8f5858806fb6aff6762199008d14b 100644 (file)
--- a/src/insets/figinset.h
+++ b/src/insets/figinset.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 /*
   figinset.h - Figure inset header - part of LyX project
-  (C)1996 by Ivan Schreter
+  Copyright 1996 by Ivan Schreter
   */
 
 #ifndef FIGINSET_H
@@ -14,58 +14,55 @@
 #include "insets/lyxinset.h"
 /* the rest is figure stuff */
 
-
 struct Figref;
 
 ///
 class InsetFig: public Inset {
 public:
        ///
-       InsetFig(int tmpx, int tmpy, Buffer *);
+       InsetFig(int tmpx, int tmpy, Buffer const &);
        ///
        ~InsetFig();
        ///
-       int ascent(Painter &, LyXFont const & font) const;
+       int ascent(BufferView *, LyXFont const & font) const;
        ///
-       int descent(Painter &, LyXFont const & font) const;
+       int descent(BufferView *, LyXFont const & font) const;
        ///
-       int width(Painter &, LyXFont const & font) const;
+       int width(BufferView *, LyXFont const & font) const;
        ///
-       void draw(Painter &, LyXFont const & font,
-                 int baseline, float & x) const;
+       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
        ///
-       void Write(ostream &) const;
+       void Write(Buffer const *, std::ostream &) const;
        ///
-       void Read(LyXLex & lex);
+       void Read(Buffer const *, LyXLex & lex);
        ///
-       int Latex(ostream &, signed char fragile) const;
-#ifndef USE_OSTREAM_ONLY
+       int Latex(Buffer const *, std::ostream &, bool fragile, bool free_space) const;
        ///
-       int Latex(string & file, signed char fragile) const;
-#endif
+       int Ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(string & file) const;
+       int Linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int DocBook(string & file) const;
+       int DocBook(Buffer const *, std::ostream &) const;
        /// Updates needed features for this inset.
        void Validate(LaTeXFeatures & features) const;
 
        /// what appears in the minibuffer when opening
-       const char * EditMessage() const { return _("Opened figure"); }
+       string const EditMessage() const;
+       
        ///
        void Edit(BufferView *, int, int, unsigned int);
        ///
-       unsigned char Editable() const;
+       EDITABLE Editable() const;
        ///
        bool Deletable() const;
        ///
        Inset::Code LyxCode() const;
        ///
-       Inset * Clone() const;
+       Inset * Clone(Buffer const &) const;
        ///
        void CallbackFig(long arg);
        ///
-       void Preview(char const * p);
+       void Preview(string const & p);
        /// browse for file
        void BrowseFile();
 
@@ -126,16 +123,18 @@ public:
 
        /// various flags
        int flags;
-       bool subfigure : 1;
+       ///
+       bool subfigure;
        /// figure reference
        Figref * figure;
        /// temporary flags
        int pflags;
-       bool psubfigure : 1;
+       ///
+       bool psubfigure;
 private:
 
        ///
-       Buffer * owner;
+       Buffer const * owner;
        /// restore values on the form
        void RestoreForm();
        /// recompute screen params