prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 712f768151efc0371bb570a6a439fa95ed7c7dcc..b07c7afd25bcf29bb79170061343007fd0350ebc 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -12,11 +12,9 @@
 #ifndef INSET_LATEX_ACCENT_H
 #define INSET_LATEX_ACCENT_H
 
-
 #include "inset.h"
 #include "LString.h"
-
-class LyXLex;
+#include "dimension.h"
 
 /** Insertion of accents
 
@@ -26,7 +24,7 @@ class LyXLex;
   it also can handle other special characters (e.g. Hstroke)
   Initiated by Ivan Schreter, later modified by Lgb.
   */
-class InsetLatexAccent : public Inset {
+class InsetLatexAccent : public InsetOld {
 public:
        ///
        InsetLatexAccent();
@@ -34,27 +32,22 @@ public:
        explicit
        InsetLatexAccent(string const & string);
        ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
-       ///
-       int width(BufferView *, LyXFont const &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
        int lbearing(LyXFont const & font) const;
        ///
        int rbearing(LyXFont const & font) const;
        ///
-       bool displayISO8859_9(BufferView *, LyXFont const & font,
-                             int baseline, float & x) const;
+       bool displayISO8859_9(PainterInfo & pi, int x, int y) const;
        ///
        void write(Buffer const *, std::ostream &) const;
        ///
        void read(Buffer const *, LyXLex & lex);
        ///
        int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
@@ -64,9 +57,9 @@ public:
        ///
        bool directWrite() const;
        ///
-       virtual Inset * clone(Buffer const &, bool same_id = false) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       Inset::Code lyxCode()const;
+       InsetOld::Code lyxCode()const;
        ///
        inline bool canDisplay();
        // should this inset be handled like a normal charater