several changes and some new insets, read the Changelog

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index b6a45ba050e34756f798fba70071c74a1e91a8aa..7174d2a55e9901d4565ecafbebb889fd3eaf25ef 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -44,7 +44,9 @@ public:
        NONE = 0,
        INIT,
        FULL,
-       CURSOR_PAR
+       CURSOR_PAR,
+       CURSOR,
+       SELECTION
     };
     ///
     explicit
@@ -70,7 +72,9 @@ public:
     ///
     int width(Painter &, LyXFont const & f) const;
     ///
-    void draw(BufferView *, LyXFont const &, int , float &) const;
+    int textWidth(Painter &) const;
+    ///
+    void draw(BufferView *, LyXFont const &, int , float &, bool) const;
     ///
     void update(BufferView *, LyXFont const &, bool =false);
     ///
@@ -191,14 +195,22 @@ private:
     int cpos(BufferView *) const;
     LyXParagraph * cpar(BufferView *) const;
     Row * crow(BufferView *) const;
+
+       /// This instead of a macro
+       LyXText * TEXT(BufferView * bv) const {
+               return getLyXText(bv);
+       }
        
     /* Private structures and variables */
     ///
-    bool locked;
+    mutable bool locked;
     ///
     int insetAscent;
     int insetDescent;
     int insetWidth;
+    mutable int last_width;
+    mutable int last_height;
+    mutable int top_y;
     ///
     int inset_pos;
     ///