Require a buffer on construction of InsetGraphics and InsetExternal. Eventually,...

[lyx.git] / src / rowpainter.h

diff --git a/src/rowpainter.h b/src/rowpainter.h
index aa550627c67d89cb60c32fbad311016379d5a90c..59dfe2cc0030174ce302370075cd2f2869fea5d1 100644 (file)
--- a/src/rowpainter.h
+++ b/src/rowpainter.h
@@ -21,7 +21,9 @@ namespace lyx {
 class Bidi;
 class BufferView;
 class Font;
+class FontInfo;
 class Inset;
+class Language;
 class PainterInfo;
 class Paragraph;
 class ParagraphList;
@@ -29,7 +31,6 @@ class ParagraphMetrics;
 class Row;
 class Text;
 class TextMetrics;
-class ViewMetricsInfo;
 
 namespace frontend { class Painter; }
 
@@ -54,27 +55,24 @@ public:
        void paintOnlyInsets();
 
 private:
-       void paintForeignMark(double orig_x, Font const & font, int desc = 0);
-       void paintHebrewComposeChar(pos_type & vpos, Font const & font);
-       void paintArabicComposeChar(pos_type & vpos, Font const & font);
-       void paintChars(pos_type & vpos, Font const & font,
+       void paintForeignMark(double orig_x, Language const * lang, int desc = 0);
+       void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font);
+       void paintArabicComposeChar(pos_type & vpos, FontInfo const & font);
+       void paintChars(pos_type & vpos, FontInfo const & font,
                        bool hebrew, bool arabic);
        int paintAppendixStart(int y);
        void paintFromPos(pos_type & vpos);
        void paintInset(Inset const * inset, pos_type const pos);
-       void paintHfill(pos_type const pos, pos_type const body_pos);
-
+       void paintInlineCompletion(Font const & font);
+       
        /// return left margin
        int leftMargin() const;
 
        /// return the label font for this row
-       Font const getLabelFont() const;
-
-       /// bufferview to paint on
-       BufferView & bv_;
+       FontInfo labelFont() const;
 
-       /// Painter to use
-       frontend::Painter & pain_;
+       /// contains painting related information.
+       PainterInfo & pi_;
 
        /// Text for the row
        Text const & text_;