fix compilation pb ; update eu.po

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 205d5adcf5cef38d9b8afccf8a6f431333e0e7b3..4d2c08985d4c060b58a36f2d92e085ca47be1443 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -99,7 +99,7 @@ public:
        ///
        void update(BufferView *, LyXFont const &, bool =false);
        ///
-       void SetUpdateStatus(BufferView *, int what);
+       void SetUpdateStatus(BufferView *, int what) const;
        ///
        string const EditMessage() const;
        ///
@@ -107,7 +107,7 @@ public:
        ///
        bool IsTextInset() const { return true; }
        ///
-       bool doClearArea() const { return !locked; }
+       bool doClearArea() const;
        ///
        void InsetUnlock(BufferView *);
        ///
@@ -128,7 +128,7 @@ public:
        UpdatableInset::RESULT LocalDispatch(BufferView *, kb_action, string const &);
        ///
        int Latex(Buffer const *, std::ostream &,
-                         bool fragile, bool free_spc) const;
+                 bool fragile, bool free_spc) const;
        ///
        int Ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
@@ -178,6 +178,18 @@ public:
        ///
        bool ShowInsetDialog(BufferView *) const;
        ///
+       std::vector<string> const getLabelList() const;
+       ///
+       bool nodraw() const;
+       ///
+       int scroll(bool recursive=true) const;
+       void scroll(BufferView *bv, float sx) const {
+               UpdatableInset::scroll(bv, sx);
+       }
+       void scroll(BufferView *bv, int offset) const {
+               UpdatableInset::scroll(bv, offset);
+       }
+
        LyXParagraph * par;
        ///
        mutable int need_update;
@@ -192,7 +204,7 @@ protected:
        ///
        bool autoBreakRows;
        ///
-       DrawFrame drawFrame;
+       DrawFrame drawFrame_;
        ///
        LColor::color frame_color;
 
@@ -209,18 +221,18 @@ private:
        void HideInsetCursor(BufferView *);
        ///
        UpdatableInset::RESULT moveRight(BufferView *, bool activate_inset = true,
-                                                                        bool selecting = false);
+                                        bool selecting = false);
        ///
        UpdatableInset::RESULT moveLeft(BufferView *, bool activate_inset = true,
-                                                                       bool selecting = false);
+                                       bool selecting = false);
        ///
        UpdatableInset::RESULT moveRightIntern(BufferView *, bool behind,
-                                                                                  bool activate_inset = true,
-                                                                                  bool selecting = false);
+                                              bool activate_inset = true,
+                                              bool selecting = false);
        ///
        UpdatableInset::RESULT moveLeftIntern(BufferView *, bool behind, 
-                                                                                 bool activate_inset = true,
-                                                                                 bool selecting = false);
+                                             bool activate_inset = true,
+                                             bool selecting = false);
 
        ///
        UpdatableInset::RESULT moveUp(BufferView *);
@@ -234,9 +246,9 @@ private:
        bool checkAndActivateInset(BufferView * bv, bool behind);
        ///
        bool checkAndActivateInset(BufferView * bv, int x = 0, int y = 0,
-                                                          int button = 0);
+                                  int button = 0);
+       ///
        void removeNewlines();
-
        ///
        int cx(BufferView *) const;
        ///
@@ -249,11 +261,15 @@ private:
        bool cboundary(BufferView *) const;
        ///
        Row * crow(BufferView *) const;
-
+       ///
        /// This instead of a macro
        LyXText * TEXT(BufferView * bv) const {
                return getLyXText(bv);
        }
+       ///
+       void drawFrame(Painter &, bool cleared) const;
+       void clearFrame(Painter &, bool cleared) const;
+       ///
        
        /* Private structures and variables */
        ///
@@ -294,5 +310,7 @@ private:
        mutable Cache cache;
        ///
        mutable int last_drawn_width;
+       ///
+       mutable bool frame_is_visible;
 };
 #endif