new painter,workarea and lcolor. Read the diff/sources and ChangeLog...

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 297c6f9e8483b7b465351b8aa6ad13f386b3111e..b8085e016b017d1bfa49694ab57de6573e354c01 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -33,21 +33,38 @@ public:
        InsetLatexAccent(); 
        ///
        InsetLatexAccent(string const & string);
+#ifdef USE_PAINTER
+       ///
+       int ascent(Painter &, LyXFont const &) const;
+       ///
+       int descent(Painter &, LyXFont const &) const;
+       ///
+       int width(Painter &, LyXFont const &) const;
+       ///
+       void draw(Painter &, LyXFont const &, int baseline, float & x) const;
+#else
        ///
        int Ascent(LyXFont const & font) const;
        ///
        int Descent(LyXFont const & font) const;
        ///
        int Width(LyXFont const & font) const;
+       ///
+       void Draw(LyXFont, LyXScreen & scr, int baseline, float & x);
+#endif
        ///
        int Lbearing(LyXFont const & font) const;
        ///
        int Rbearing(LyXFont const & font) const;
+#ifdef USE_PAINTER
+       ///
+       bool DisplayISO8859_9(Painter &, LyXFont const & font,
+                             int baseline, float & x) const;
+#else
        ///
        bool DisplayISO8859_9(LyXFont font, LyXScreen & scr,
                              int baseline, float & x);
-       ///
-       void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
+#endif
        ///
        void Write(ostream &);
        ///
@@ -133,7 +150,7 @@ private:
        /// add something to descent - underlined char
        bool  plusdesc;
        /// international char
-       char  ic;    
+       mutable char  ic;    
 };
 
 bool InsetLatexAccent::CanDisplay()