Enable convertDefault.sh to run even if its executable bit is not set.

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

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index b733d9ec6dfd74eecb6a30a659fcbf56b520be14..b50e61dadb05c94ea3aa2e9b9783909dd81731b4 100644 (file)
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -8,7 +8,7 @@
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETCOLLAPSABLE_H
@@ -19,6 +19,7 @@
 #include "lyxfont.h"
 #include "funcrequest.h" // for adjustCommand
 #include "LColor.h"
+#include "box.h"
 
 #include <boost/weak_ptr.hpp>
 
@@ -41,24 +42,23 @@ public:
        ///
        InsetCollapsable(InsetCollapsable const & in);
        ///
-       void read(Buffer const *, LyXLex &);
+       void read(Buffer const &, LyXLex &);
        ///
-       void write(Buffer const *, std::ostream &) const;
+       void write(Buffer const &, std::ostream &) const;
        ///
-       void dimension(BufferView *, LyXFont const &, Dimension &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       void draw(BufferView *, const LyXFont &, int, float &) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        /// draw, either inlined (no button) or collapsed/open
-       void draw(BufferView * bv, LyXFont const & f,
-                 int baseline, float & x, bool inlined) const;
+       void draw(PainterInfo & pi, int x, int y, bool inlined) const;
        ///
-       void update(BufferView *, bool = false);
+       bool hitButton(FuncRequest const &) const;
        ///
        EDITABLE editable() const;
        ///
-       bool insertInset(BufferView *, Inset * inset);
+       bool insertInset(BufferView *, InsetOld * inset);
        ///
-       virtual bool insetAllowed(Inset::Code code) const {
+       virtual bool insetAllowed(InsetOld::Code code) const {
                return inset.insetAllowed(code);
        }
        ///
@@ -66,27 +66,23 @@ public:
        ///
        void insetUnlock(BufferView *);
        ///
-       bool needFullRow() const { return isOpen(); }
-       ///
        bool lockInsetInInset(BufferView *, UpdatableInset *);
        ///
        bool unlockInsetInInset(BufferView *, UpdatableInset *,
                                bool lr = false);
        ///
-       bool updateInsetInInset(BufferView *, Inset *);
-       ///
        int insetInInsetY() const;
        ///
        RESULT localDispatch(FuncRequest const &);
        ///
-       int latex(Buffer const *, std::ostream &,
+       int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int) const;
+       int ascii(Buffer const &, std::ostream &, int) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
        ///
        void validate(LaTeXFeatures & features) const;
        /// FIXME, document
@@ -99,7 +95,7 @@ public:
        }
        UpdatableInset * getLockingInset() const;
        ///
-       UpdatableInset * getFirstLockingInsetOfType(Inset::Code);
+       UpdatableInset * getFirstLockingInsetOfType(InsetOld::Code);
        ///
        void setFont(BufferView *, LyXFont const &, bool toggleall = false,
                 bool selectall = false);
@@ -116,11 +112,7 @@ public:
        ///
        void deleteLyXText(BufferView *, bool recursive=true) const;
        ///
-       void resizeLyXText(BufferView *, bool force = false) const;
-       ///
-       std::vector<string> const getLabelList() const;
-       ///
-       bool nodraw() const;
+       void getLabelList(std::vector<string> &) const;
        ///
        int scroll(bool recursive=true) const;
        ///
@@ -132,7 +124,7 @@ public:
                UpdatableInset::scroll(bv, offset);
        }
        ///
-       Inset * getInsetFromID(int id) const;
+       InsetOld * getInsetFromID(int id) const;
        ///
        ParagraphList * getParagraphs(int) const;
        ///
@@ -152,10 +144,6 @@ public:
        void selectSelectedWord(BufferView * bv) {
                inset.selectSelectedWord(bv);
        }
-       ///
-       void toggleSelection(BufferView * bv, bool kill_selection) {
-               inset.toggleSelection(bv, kill_selection);
-       }
 
        void markErased();
 
@@ -168,7 +156,7 @@ public:
                            bool = true, bool = false);
 
        ///
-       void addPreview(grfx::PreviewLoader &) const;
+       void addPreview(lyx::graphics::PreviewLoader &) const;
 
 protected:
        ///
@@ -181,7 +169,7 @@ protected:
        ///
        int height_collapsed() const;
        ///
-       void draw_collapsed(Painter & pain, int, float &) const;
+       void draw_collapsed(PainterInfo & pi, int x, int y) const;
        ///
        int getMaxTextWidth(Painter & pain, UpdatableInset const *) const;
 
@@ -196,11 +184,7 @@ public:
        mutable InsetText inset;
 protected:
        ///
-       mutable int button_length;
-       ///
-       mutable int button_top_y;
-       ///
-       mutable int button_bottom_y;
+       mutable Box button_dim;
        ///
        mutable int topx;
        mutable int topbaseline;
@@ -217,8 +201,6 @@ private:
        ///
        bool autocollapse;
 #endif
-       ///
-       mutable int oldWidth;
        ///
        bool in_update;
        ///