X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetListings.h;h=902fa0437e64009770293859e2540322c3b53fd9;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=fcf16726ea68054c7dcb3c343742f1926d456582;hpb=78c45693ef3f99a7671443238b448f4a69fd7717;p=lyx.git

diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index fcf16726ea..902fa0437e 100644
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -12,25 +12,26 @@
 #ifndef INSET_LISTINGS_H
 #define INSET_LISTINGS_H
 
-#include "LaTeXFeatures.h"
-#include "InsetERT.h"
 #include "InsetListingsParams.h"
 
 
 namespace lyx {
 
+class LaTeXFeatures;
+struct TexString;
+
 /////////////////////////////////////////////////////////////////////////
 //
 // InsetListings
 //
 /////////////////////////////////////////////////////////////////////////
 
-/// A collapsable text inset for program listings.
-class InsetListings : public InsetCollapsable
+/// A captionable and collapsable text inset for program listings.
+class InsetListings : public InsetCaptionable
 {
 public:
 	///
-	InsetListings(Buffer const &, InsetListingsParams const & par = InsetListingsParams());
+	InsetListings(Buffer *, InsetListingsParams const & par = InsetListingsParams());
 	///
 	~InsetListings();
 	///
@@ -40,22 +41,22 @@ public:
 private:
 	///
 	bool isLabeled() const { return true; }
+	/// false is needed since listings do their own font handling.
+	bool inheritFont() const { return false; }
 	///
 	InsetCode lyxCode() const { return LISTINGS_CODE; }
 	/// lstinline is inlined, normal listing is displayed
 	DisplayType display() const;
 	///
-	docstring name() const { return from_ascii("Listings"); }
-	// Update the counters of this inset and of its contents
-	void updateLabels(ParIterator const &);
+	docstring layoutName() const { return from_ascii("Listings"); }
 	///
 	void write(std::ostream & os) const;
 	///
 	void read(Lexer & lex);
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
-	docstring xhtml(odocstream &, OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 	///
@@ -65,7 +66,7 @@ private:
 	///
 	InsetListingsParams & params() { return params_; }
 	///
-	docstring contextMenu(BufferView const & bv, int x, int y) const;
+	std::string contextMenuName() const;
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
@@ -75,7 +76,9 @@ private:
 	///
 	docstring const buttonLabel(BufferView const & bv) const;
 	///
-	docstring getCaption(OutputParams const &) const;
+	TexString getCaption(OutputParams const &) const;
+	///
+	bool insetAllowed(InsetCode c) const { return c == CAPTION_CODE || c == QUOTE_CODE; }
 
 	///
 	InsetListingsParams params_;