The markDirty() and fitCursor() changes

[lyx.git] / src / insets / insettext.h

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index d45079ebb5c6eb2de12b166ca5b988504c7e8c82..c6a199386fa9ad8006eab6ab8408b99c4d3e4b9b 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -13,7 +13,7 @@
 #define INSETTEXT_H
 
 
-#include "inset.h"
+#include "updatableinset.h"
 #include "LString.h"
 #include "LColor.h"
 #include "ParagraphList.h"
@@ -47,17 +47,15 @@ public:
                ///
                CURSOR = 1,
                ///
-               CLEAR_FRAME = 2,
+               DRAW_FRAME = 2,
                ///
-               DRAW_FRAME = 4,
+               SELECTION = 4,
                ///
-               SELECTION = 8,
+               CURSOR_PAR = 8,
                ///
-               CURSOR_PAR = 16,
+               FULL = 16,
                ///
-               FULL = 32,
-               ///
-               INIT = 64
+               INIT = 32
        };
        ///
        enum DrawFrame {
@@ -94,7 +92,7 @@ public:
        ///
        int textWidth(BufferView *, bool fordraw = false) const;
        ///
-       void draw(BufferView *, LyXFont const &, int , float &, bool) const;
+       void draw(BufferView *, LyXFont const &, int , float &) const;
        ///
        void update(BufferView *, LyXFont const &, bool = false);
        ///
@@ -108,8 +106,6 @@ public:
        ///
        bool isTextInset() const { return true; }
        ///
-       bool doClearArea() const;
-       ///
        void insetUnlock(BufferView *);
        ///
        bool lockInsetInInset(BufferView *, UpdatableInset *);
@@ -203,8 +199,6 @@ public:
        ///
        void clearSelection(BufferView * bv);
        ///
-       Paragraph * getParFromID(int id) const;
-       ///
        Inset * getInsetFromID(int id) const;
        ///
        Paragraph * firstParagraph() const;
@@ -225,7 +219,7 @@ public:
        void selectSelectedWord(BufferView *);
        ///
        void toggleSelection(BufferView *, bool kill_selection);
- 
+
        /// mark as erased for change tracking
        void markErased() { clear(true); };
        /**
@@ -238,7 +232,7 @@ public:
        void markNew(bool track_changes = false);
        /// find next change
        bool nextChange(BufferView *, lyx::pos_type & length);
- 
+
        ///
        bool searchForward(BufferView *, string const &,
                           bool = true, bool = false);
@@ -250,8 +244,8 @@ public:
        ///
        void getDrawFont(LyXFont &) const;
        /// append text onto the existing text
-       void appendParagraphs(BufferParams const & bp, Paragraph *);
- 
+       void appendParagraphs(Buffer * bp, Paragraph *);
+
        ///
        void addPreview(grfx::PreviewLoader &) const;
 
@@ -260,9 +254,11 @@ public:
        ///
        mutable int need_update;
 
+       ///
+       ParagraphList paragraphs;
 protected:
        ///
-       void updateLocal(BufferView *, int what, bool mark_dirty) const;
+       void updateLocal(BufferView *, int what, bool mark_dirty);
        /// set parameters for an initial lock of this inset
        void lockInset(BufferView *);
        /// lock an inset inside this one
@@ -300,8 +296,6 @@ private:
        ///
        typedef Cache::value_type value_type;
        ///
-       int beginningOfMainBody(Paragraph * par) const;
-       ///
        RESULT moveRight(BufferView *,
                                         bool activate_inset = true,
                                         bool selecting = false);
@@ -348,24 +342,20 @@ private:
        ///
        Row * crow(BufferView *) const;
        ///
-       void drawFrame(Painter &, bool cleared) const;
-       ///
-       void clearFrame(Painter &, bool cleared) const;
+       void drawFrame(Painter &) const;
        ///
-       void clearInset(BufferView *, int baseline, bool & cleared) const;
+       void clearInset(BufferView *, int baseline) const;
        ///
        void saveLyXTextState(LyXText *) const;
        ///
-       void restoreLyXTextState(BufferView *, LyXText *) const;
+       void restoreLyXTextState(LyXText *) const;
        ///
        void reinitLyXText() const;
        ///
-       void collapseParagraphs(BufferView *) const;
+       void collapseParagraphs(BufferView *);
 
        /* Private structures and variables */
        ///
-       ParagraphList paragraphs;
-       ///
        mutable bool locked;
        ///
        mutable int insetAscent;
@@ -398,8 +388,6 @@ private:
        ///
        mutable int last_drawn_width;
        ///
-       mutable bool frame_is_visible;
-       ///
        mutable BufferView * cached_bview;
        ///
        mutable boost::shared_ptr<LyXText> cached_text;
@@ -416,7 +404,6 @@ private:
                bool selendboundary;
                bool selection;
                bool mark_set;
-               bool refresh;
        };
        ///
        mutable save_state sstate;