X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.h;h=b1070d8a33d051b960568dbeb03e36f5be75084e;hb=25ef8e7eef8dfb2b6d6d4f2935ae6775ebf2ba60;hp=7b2c04c6276d69a1be30822a47ca7709009384cf;hpb=ee6e5b784db5f0ef1a0c1a73176792cf7fb8f1c9;p=lyx.git

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 7b2c04c627..b1070d8a33 100644
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -17,6 +17,7 @@
 
 #include "ColorCode.h"
 #include "InsetCode.h"
+#include "InsetLayout.h"
 #include "LayoutEnums.h"
 #include "OutputEnums.h"
 
@@ -402,31 +403,24 @@ public:
 	/// Is the content of this inset part of the output document?
 	virtual bool producesOutput() const { return true; }
 
-	/// Skip this inset while searching?
-	virtual bool skipOnSearch() const { return false; }
-
 	/// \return Tool tip for this inset.
 	/// This default implementation returns an empty string.
 	virtual docstring toolTip(BufferView const & bv, int x, int y) const;
 	
 	/// \return Context menu identifier. This function determines
 	/// whose Inset's menu should be shown for the given position.
-	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+	virtual std::string contextMenu(BufferView const & bv, int x, int y) const;
 
 	/// \return Context menu identifier for this inset.
 	/// This default implementation returns an empty string.
-	virtual docstring contextMenuName() const;
+	virtual std::string contextMenuName() const;
 
 
-	// FIXME This should really disappear in favor of 
-	//	docstring name() const { return from_ascii(insetName(lyxCode()))); }
-	// There's no reason to be using different names in different places.
-	// But to do this we would need to change the file format, since the names
-	// used there don't correspond to what is used here. 
-	///
-	virtual docstring name() const;
+	virtual docstring layoutName() const;
 	///
 	virtual InsetLayout const & getLayout() const;
+	///
+	virtual bool isPassThru() const { return getLayout().isPassThru(); }
 	/// Is this inset's layout defined in the document's textclass?
 	bool undefined() const;
 	/// should this inset be handled like a normal character?