The insettext patch.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 9395bb8490620fc6536311082499681445f09414..1163ff27487401d365d84573d6dfa159a30fa26c 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -54,21 +54,6 @@ public:
                REFRESH_AREA = 2
        };
 
-       ///
-       enum word_location {
-               // the word around the cursor, only if the cursor is
-               //not at a boundary
-               WHOLE_WORD_STRICT,
-               // the word around the cursor
-               WHOLE_WORD,
-               /// the word begining from the cursor position
-               PARTIAL_WORD,
-               /// the word around the cursor or before the cursor
-               PREVIOUS_WORD,
-               /// the next word (not yet used)
-               NEXT_WORD
-       };
-
        /// Constructor
        LyXText(BufferView *);
        /// sets inset as owner
@@ -238,9 +223,11 @@ private:
 
        refresh_status refresh_status_;
 
+public:
        /// only the top-level LyXText has this non-zero
        BufferView * bv_owner;
 
+private:
        /// returns a pointer to a specified row.
        RowList::iterator
        getRow(ParagraphList::iterator pit, lyx::pos_type pos) const;
@@ -249,7 +236,7 @@ public:
        RowList::iterator getRow(LyXCursor const & cursor) const;
        /// convenience
        RowList::iterator cursorRow() const;
-       
+
        /** returns a pointer to the row near the specified y-coordinate
          (relative to the whole text). y is set to the real beginning
          of this row
@@ -272,19 +259,16 @@ public:
                return rowlist_;
        }
 
-       
+
        /// need the selection cursor:
        void setSelection();
        ///
        void clearSelection();
-       ///
-       string const selectionAsString(Buffer const *, bool label) const;
 
        /// select the word we need depending on word_location
-       void getWord(LyXCursor & from, LyXCursor & to,
-                    word_location const);
+       void getWord(LyXCursor & from, LyXCursor & to, lyx::word_location const);
        /// just selects the word the cursor is in
-       void selectWord(word_location const);
+       void selectWord(lyx::word_location loc);
        /// returns the inset at cursor (if it exists), 0 otherwise
        Inset * getInset() const;
 
@@ -365,7 +349,7 @@ public:
        ///
        void backspace();
        ///
-       bool selectWordWhenUnderCursor(word_location);
+       bool selectWordWhenUnderCursor(lyx::word_location);
        ///
        enum TextCase {
                ///
@@ -454,8 +438,6 @@ public:
 private:
        ///
        mutable RowList rowlist_;
-       ///
-       void cursorLeftOneWord(LyXCursor &);
 
        ///
        float getCursorX(RowList::iterator rit, lyx::pos_type pos,