several small patches and some fixes, read the ChangeLog

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

diff --git a/src/insets/inseterror.h b/src/insets/inseterror.h
index 4179e6cb7870b26d32e140d97beb9448e54d56df..519da5fe93dff0ddeeac40001ac9138aee86016f 100644 (file)
--- a/src/insets/inseterror.h
+++ b/src/insets/inseterror.h
@@ -4,7 +4,8 @@
  *
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team. 
  *
  * ====================================================== */
 
@@ -28,39 +29,40 @@
 class InsetError: public Inset {
 public:
        ///
+       explicit
        InsetError(string const & string);
        ///
        InsetError();
        ///
        ~InsetError();
        ///
-       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_spc) 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;
        ///
        bool AutoDelete() const;
        /// what appears in the minibuffer when opening
-       char const * EditMessage() const {return _("Opened error");}
+       char const * EditMessage() const;
        ///
-       void Edit(int, int);
+       void Edit(BufferView *, int x, int y, unsigned int button);
        ///
-       unsigned char Editable() const;
+       EDITABLE Editable() const;
        ///
        Inset * Clone() const;
        ///