]> git.lyx.org Git - lyx.git/blobdiff - src/lyxtext.h
remove reinit argument from LyXText::init (act as if always true)
[lyx.git] / src / lyxtext.h
index 2acca6d6d4a464529f799e3eb3969990eb683fe9..438b41e99c0f9e88d6cd372bcd9468569c632db4 100644 (file)
@@ -54,27 +54,12 @@ 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
        LyXText(BufferView *, InsetText *);
 
-       void init(BufferView *, bool reinit = false);
+       void init(BufferView *);
        ///
        int height;
        ///
@@ -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;
@@ -279,9 +266,9 @@ public:
        void clearSelection();
 
        /// 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 loc);
+       void selectWord(lyx::word_location loc);
        /// returns the inset at cursor (if it exists), 0 otherwise
        Inset * getInset() const;
 
@@ -362,7 +349,7 @@ public:
        ///
        void backspace();
        ///
-       bool selectWordWhenUnderCursor(word_location);
+       bool selectWordWhenUnderCursor(lyx::word_location);
        ///
        enum TextCase {
                ///
@@ -451,8 +438,6 @@ public:
 private:
        ///
        mutable RowList rowlist_;
-       ///
-       void cursorLeftOneWord(LyXCursor &);
 
        ///
        float getCursorX(RowList::iterator rit, lyx::pos_type pos,