Don't remove cell selections after fontchange.

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

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index 2122b8a3a5cae2202237295f8373de3c10a0821c..2880a32027d68186e0189bd50894f561504e5307 100644 (file)
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -46,8 +46,6 @@ public:
        ///
        InsetCollapsable(InsetCollapsable const & in, bool same_id = false);
        ///
-       Inset * clone(Buffer const &, bool same_id = false) const;
-       
        void read(Buffer const *, LyXLex &);
        ///
        void write(Buffer const *, std::ostream &) const;
@@ -56,7 +54,7 @@ public:
        ///
        int descent(BufferView *, LyXFont const &) const;
        ///
-       int width(BufferView *, LyXFont const & f) const;
+       int width(BufferView *, LyXFont const &) const;
        ///
        void draw(BufferView *, const LyXFont &, int , float &, bool) const;
        ///
@@ -70,7 +68,7 @@ public:
        ///
        bool insertInset(BufferView *, Inset * inset);
        ///
-       bool insetAllowed(Inset::Code code) const {
+       virtual bool insetAllowed(Inset::Code code) const {
                return inset.insetAllowed(code);
        }
        ///
@@ -80,18 +78,18 @@ public:
        ///
        void insetUnlock(BufferView *);
        ///
-       bool needFullRow() const { return !collapsed_; }
+       bool needFullRow() const { return isOpen(); }
        ///
        bool lockInsetInInset(BufferView *, UpdatableInset *);
        ///
        bool unlockInsetInInset(BufferView *, UpdatableInset *,
-                               bool lr = false);
+                               bool lr = false);
        ///
        bool updateInsetInInset(BufferView *, Inset *);
        ///
        unsigned int insetInInsetY();
        ///
-       void insetButtonRelease(BufferView *, int, int, int);
+       bool insetButtonRelease(BufferView *, int, int, int);
        ///
        void insetButtonPress(BufferView *, int, int, int);
        ///
@@ -100,16 +98,16 @@ public:
        void insetKeyPress(XKeyEvent *);
        ///
        UpdatableInset::RESULT localDispatch(BufferView *, kb_action,
-                                            string const &);
+                                            string const &);
        ///
        int latex(Buffer const *, std::ostream &,
                  bool fragile, bool free_spc) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int) const { return 0; }
+       int ascii(Buffer const *, std::ostream &, int) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const { return 0; }
+       int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int docBook(Buffer const *, std::ostream &) const { return 0; }
+       int docbook(Buffer const *, std::ostream &) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
@@ -130,21 +128,18 @@ public:
        ///
        void setFont(BufferView *, LyXFont const &, bool toggleall = false,
                  bool selectall = false);
-#if 0
        ///
-       void setLabel(string const & l, bool flag = false);
-#else
-       ///
-       void setLabel(string const & l);
-#endif
+       void setLabel(string const & l) const;
        ///
        void setLabelFont(LyXFont & f) { labelfont = f; }
 #if 0
        ///
        void setAutoCollapse(bool f) { autocollapse = f; }
 #endif
+#if 0
        ///
        int getMaxWidth(BufferView *, UpdatableInset const *) const;
+#endif
        ///
        LyXText * getLyXText(BufferView const *, bool const recursive) const;
        ///
@@ -172,22 +167,19 @@ public:
        ///
        Paragraph * firstParagraph() const;
        ///
+       Paragraph * getFirstParagraph(int) const;
+       ///
        LyXCursor const & cursor(BufferView *) const;
        ///
        bool isOpen() const { return !collapsed_; }
-#if 0
-       ///
-       void open(BufferView *, bool);
-#else
        ///
        void open(BufferView *);
        ///
-       void close(BufferView *);
-#endif
+       void close(BufferView *) const;
        ///
-       string const selectNextWord(BufferView * bv, float & value) const {
-               return inset.selectNextWord(bv, value);
-       }
+       bool allowSpellcheck() { return inset.allowSpellcheck(); }
+       string const selectNextWordToSpellcheck(BufferView *, float &) const;
+
        void selectSelectedWord(BufferView * bv) {
                inset.selectSelectedWord(bv);
        }
@@ -196,13 +188,9 @@ public:
        }
        ///
        bool searchForward(BufferView * bv, string const & str,
-                          bool const & cs = true, bool const & mw = false) {
-               return inset.searchForward(bv, str, cs, mw);
-       }
+                          bool = true, bool = false);
        bool searchBackward(BufferView * bv, string const & str,
-                           bool const & cs = true, bool const & mw = false) {
-               return inset.searchBackward(bv, str, cs, mw);
-       }
+                           bool = true, bool = false);
 
 protected:
        ///
@@ -217,32 +205,29 @@ protected:
        int getMaxTextWidth(Painter & pain, UpdatableInset const *) const;
        
        ///
-       bool collapsed_;
+       mutable bool collapsed_;
        ///
        LColor::color framecolor;
        ///
        LyXFont labelfont;
 public:
        ///
-       InsetText inset;
+       mutable InsetText inset;
 protected:
-#if 0
-       ///
-       string const get_new_label() const;
-#endif
        ///
        mutable int button_length;
        ///
        mutable int button_top_y;
        ///
        mutable int button_bottom_y;
+       ///
+       mutable int topx;
+       mutable int topbaseline;
+       mutable UpdateCodes need_update;
+
 private:
        ///
-       string label;
-#if 0
-       ///
-       mutable string draw_label;
-#endif
+       mutable string label;
 #if 0
        ///
        bool autocollapse;
@@ -250,15 +235,9 @@ private:
        ///
        mutable int oldWidth;
        ///
-       mutable int topx;
-       mutable int topbaseline;
-       mutable UpdateCodes need_update;
+       bool in_update;
        ///
-       bool inlined;
-#if 0
-       ///
-       bool change_label_with_text;
-#endif
+       mutable bool first_after_edit;
 };
 
 #endif