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

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 3b3e4306d3..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"
 
@@ -408,22 +409,18 @@ public:
 	
 	/// \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?