clean up a bit

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 176b9192e486ca46a6d649ae5219eff41d1e333c..7135568767a2716f82850dc97ca23d5b72ad928d 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -281,6 +281,12 @@ public:
        /// returns the inset at cursor (if it exists), 0 otherwise
        Inset * getInset() const;
 
+       /// accept selected change
+       void acceptChange(BufferView * bv);
+
+       /// reject selected change 
+       void rejectChange(BufferView * bv);
+ 
        /** 'selects" the next word, where the cursor is not in
         and returns this word as string. THe cursor will be moved
         to the beginning of this word.
@@ -408,10 +414,11 @@ public:
 
        /* these things are for search and replace */
 
-       /** sets the selection over the number of characters of string,
-         no check!!
-         */
-       void setSelectionOverString(BufferView *, string const & str);
+       /**
+        * Sets the selection from the current cursor position to length
+        * characters to the right. No safety checks.
+        */
+       void setSelectionRange(BufferView *, lyx::pos_type length);
 
        /** simple replacing. The font of the first selected character
          is used
@@ -485,7 +492,7 @@ private:
 
        ///
        void cursorLeftOneWord(LyXCursor &) const;
- 
+
        ///
        float getCursorX(BufferView *, Row *, lyx::pos_type pos,
                                         lyx::pos_type last, bool boundary) const;
@@ -511,13 +518,13 @@ private:
        /** inserts a new row behind the specified row, increments
            the touched counters */
        void insertRow(Row * row, Paragraph * par, lyx::pos_type pos) const;
-       /// removes the row and reset the touched counters 
+       /// removes the row and reset the touched counters
        void removeRow(Row * row) const;
 
        /// remove all following rows of the paragraph of the specified row.
        void removeParagraph(Row * row) const;
 
-       /// insert the specified paragraph behind the specified row 
+       /// insert the specified paragraph behind the specified row
        void insertParagraph(BufferView *,
                             Paragraph * par, Row * row) const;
 
@@ -574,12 +581,15 @@ private:
        /// paint the selection background
        void paintRowSelection(DrawRowParams & p);
 
+       /// paint change bar
+       void paintChangeBar(DrawRowParams & p);
+ 
        /// paint appendix marker
        void paintRowAppendix(DrawRowParams & p);
 
        /// paint page break marker. Returns its height.
        int paintPageBreak(string const & label, int y, DrawRowParams & p);
- 
+
        /// paint env depth bar
        void paintRowDepthBar(DrawRowParams & p);
 
@@ -613,7 +623,7 @@ public:
        /** Updates all counters starting BEHIND the row. Changed paragraphs
         * with a dynamic left margin will be rebroken. */
        void updateCounters(BufferView *) const;
-       /// 
+       ///
        void update(BufferView * bv, bool changed = true);
        /**
         * Returns an inset if inset was hit, or 0 if not.
@@ -671,7 +681,7 @@ private:
        ///
        lyx::pos_type beginningOfMainBody(Buffer const *, Paragraph const * par) const;
 
-       /** 
+       /**
         * Returns the left beginning of the text.
         * This information cannot be taken from the layout object, because
         * in LaTeX the beginning of the text fits in some cases