Exporter.cpp: revert r34230 because this interferes with Enrico's new LyXVC feature...

[lyx.git] / src / rowpainter.h

diff --git a/src/rowpainter.h b/src/rowpainter.h
index c9bcafb7231940c6d683753f47602ac8dae7fc43..9a8a7cdd5eb5e42f229e44d04c4eca296182c67e 100644 (file)
--- a/src/rowpainter.h
+++ b/src/rowpainter.h
@@ -6,7 +6,7 @@
  *
  * \author various
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,6 +14,8 @@
 #ifndef ROWPAINTER_H
 #define ROWPAINTER_H
 
+#include "Changes.h"
+
 #include "support/types.h"
 
 namespace lyx {
@@ -56,6 +58,7 @@ public:
 
 private:
        void paintForeignMark(double orig_x, Language const * lang, int desc = 0);
+       void paintMisspelledMark(double orig_x, int desc);
        void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font);
        void paintArabicComposeChar(pos_type & vpos, FontInfo const & font);
        void paintChars(pos_type & vpos, FontInfo const & font,
@@ -63,13 +66,13 @@ private:
        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
-       FontInfo const getLabelFont() const;
+       FontInfo labelFont() const;
 
        /// contains painting related information.
        PainterInfo & pi_;
@@ -92,8 +95,8 @@ private:
        /// one of them is active at a time.
        Bidi & bidi_;
 
-       /// is row erased? (change tracking)
-       bool erased_;
+       /// row changed? (change tracking)
+       Change const change_;
 
        // Looks ugly - is
        double const xo_;