Fix small bug in reading \set_color in lyxrc

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 938752c3e0d0d8e9f1ff16157bd817884f72cc75..1a0d5c4cfaf785c6829b047b3bd2575489a5fa4d 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -41,14 +41,9 @@ public:
                ///
                NEED_MORE_REFRESH,
                ///
-               NEED_VERY_LITTLE_REFRESH
-       };
-
-       enum Letter_Form {
-               FORM_ISOLATED,
-               FORM_INITIAL,
-               FORM_MEDIAL,
-               FORM_FINAL
+               NEED_VERY_LITTLE_REFRESH,
+               ///
+               CHANGED_IN_DRAW
        };
 
        /// Constructor
@@ -63,7 +58,7 @@ public:
        mutable int number_of_rows;
        ///
        mutable long height;
-       mutable int  width;
+       mutable unsigned int width;
        /// the current font settings
        mutable LyXFont current_font;
        /// the current font
@@ -75,9 +70,6 @@ public:
        ///
        InsetText * inset_owner;
 
-       ///
-       //      void owner(BufferView *);
-       
        ///
        LyXFont GetFont(Buffer const *, LyXParagraph * par,
                        LyXParagraph::size_type pos) const;
@@ -157,8 +149,10 @@ public:
            Returns true if something was broken. */
         bool FullRebreak(BufferView *);
 
+#ifndef NEW_INSETS
        ///
        LyXParagraph::footnote_flag GetFootnoteFlag(int row);
+#endif
        ///
        Row * need_break_row;
        ///
@@ -275,7 +269,8 @@ public:
 
        ///
        void SetCursorFromCoordinates(BufferView *, int x, long y) const;
-       void SetCursorFromCoordinates(BufferView *, LyXCursor &, int x, long y) const;
+       void SetCursorFromCoordinates(BufferView *, LyXCursor &,
+                                     int x, long y) const;
        ///
        void CursorUp(BufferView *) const;
        ///
@@ -332,8 +327,9 @@ public:
          solution but faster.
         */
        void GetVisibleRow(BufferView *, int y_offset, int x_offset,
-                          Row * row_ptr, long y);
+                          Row * row_ptr, long y, bool cleared=false);
 
+#ifndef NEW_INSETS
        /* footnotes: */
        ///
        void ToggleFootnote(BufferView *);
@@ -355,6 +351,7 @@ public:
                                       LyXParagraph::footnote_kind kind);
        ///
        void MeltFootnoteEnvironment(BufferView *);
+#endif
        ///
        void CutSelection(BufferView *, bool = true);
        ///
@@ -506,8 +503,6 @@ public:
        ///
        int workWidth(BufferView *) const;
        ///
-       //      Buffer * buffer() const;
-       ///
        void ComputeBidiTables(Buffer const *, Row * row) const;
 
        /// Maps positions in the visual string to positions in logical string.
@@ -676,9 +671,6 @@ private:
        ///
        mutable bool bidi_same_direction;
 
-       ///
-       unsigned char TransformChar(unsigned char c, Letter_Form form) const;
-
        ///
        unsigned char TransformChar(unsigned char c, LyXParagraph * par,
                                LyXParagraph::size_type pos) const;