X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCollapsable.h;h=d7d050e3fea9a44aba29ea8d1b5b28026714f58d;hb=3588f2f69675df8dbf829800b0ed6e4a455c68b4;hp=74dfbdf6e4e158d54ac36fa81e972cb59f594f5c;hpb=6b96abd21117e3e3cba7d3eff72f05d90b2fd2d7;p=lyx.git

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 74dfbdf6e4..d7d050e3fe 100644
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -14,11 +14,11 @@
 #ifndef INSETCOLLAPSABLE_H
 #define INSETCOLLAPSABLE_H
 
-#include "Inset.h"
 #include "InsetText.h"
 
 #include "Box.h"
-#include "TextClass.h"
+
+#include <map>
 
 namespace lyx {
 
@@ -37,13 +37,15 @@ public:
 	///
 	InsetCollapsable(InsetCollapsable const & rhs);
 	///
+	virtual ~InsetCollapsable();
+	///
 	InsetCollapsable * asInsetCollapsable() { return this; }
 	///
 	InsetCollapsable const * asInsetCollapsable() const { return this; }
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
-	docstring name() const { return from_ascii("Collapsable"); }
+	docstring layoutName() const { return from_ascii("Collapsable"); }
 	///
 	void read(Lexer &);
 	///
@@ -66,6 +68,8 @@ public:
 	bool editable() const;
 	///
 	bool hasSettings() const { return true; }
+	///
+	bool clickable(int x, int y) const;
 	/// can we go further down on mouse click?
 	bool descendable(BufferView const & bv) const;
 	///
@@ -125,7 +129,7 @@ public:
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	bool setMouseHover(bool mouse_hover);
+	bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
 	///
 	ColorCode backgroundColor(PainterInfo const &) const
 		{ return getLayout().bgcolor(); }
@@ -137,7 +141,11 @@ public:
 	///
 	virtual bool usePlainLayout() const { return true; }
 	///
-	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+	std::string contextMenu(BufferView const & bv, int x, int y) const;
+	///
+	std::string contextMenuName() const;
+	///
+	docstring floatName(std::string const & type) const;
 protected:
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
@@ -147,8 +155,6 @@ protected:
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
 	///
-	docstring floatName(std::string const & type) const;
-	///
 	mutable CollapseStatus status_;
 private:
 	///
@@ -163,7 +169,7 @@ private:
 	/// dependent on the bufferview, compare with MathMacro::editing_.
 	mutable std::map<BufferView const *, bool> auto_open_;
 	/// changes color when mouse enters/leaves this inset
-	bool mouse_hover_;
+	mutable std::map<BufferView const *, bool> mouse_hover_;
 };
 
 } // namespace lyx