Code cleanup in RowPainter

[features.git] / src / RowPainter.h

diff --git a/src/RowPainter.h b/src/RowPainter.h
index 9a615f94becd55fc93ee98dc6b1b8c20fbd56d41..f3dc1adff8f53b9f38db93238cd03fed324b1b4f 100644 (file)
--- a/src/RowPainter.h
+++ b/src/RowPainter.h
@@ -70,14 +70,19 @@ public:
        void paintFirst() const;
        void paintLast();
        void paintText();
+       void paintText2();
        void paintOnlyInsets();
        void paintSelection() const;
 
 private:
-       void paintSeparator(double orig_x, double width, FontInfo const & font);
+       void paintSeparator(double width, Font const & font);
        void paintForeignMark(double orig_x, Language const * lang, int desc = 0) const;
-       void paintMisspelledMark(double orig_x, bool changed) const;
-       void paintChars(pos_type & vpos, Font const & font);
+       void paintStringAndSel(docstring const & str, Font const & font,
+                         Change const & change,
+                         pos_type start_pos, pos_type end_pos);
+       void paintMisspelledMark(double orig_x,
+                                docstring const & str, Font const & font,
+                                pos_type pos, bool changed) const;
        int paintAppendixStart(int y) const;
        void paintFromPos(pos_type & vpos, bool changed);
        void paintInset(Inset const * inset, pos_type const pos);
@@ -122,9 +127,9 @@ private:
        int const yo_;    // current baseline
        double x_;
        int width_;
-       float solid_line_thickness_;
+       int solid_line_thickness_;
        int solid_line_offset_;
-       float dotted_line_thickness_;
+       int dotted_line_thickness_;
        int dotted_line_offset_;
 };