X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetListings.h;h=88d380a8b2c30e159d96d4674eb0029d9a8fef24;hb=142caff8336c54627606c09d3ce5bb7de7a8adb6;hp=f5cf33ce886957188e5f1c6594c9e9e0f356002a;hpb=36dbec45069bf3d9db923200835e44f44d904eb8;p=lyx.git

diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index f5cf33ce88..88d380a8b2 100644
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -9,45 +9,54 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef INSETLISTINGS_H
-#define INSETLISTINGS_H
+#ifndef INSET_LISTINGS_H
+#define INSET_LISTINGS_H
 
 #include "LaTeXFeatures.h"
-#include "InsetERT.h"
 #include "InsetListingsParams.h"
-#include "MailInset.h"
 
 
 namespace lyx {
 
-/** A collapsable text inset for program listings.
- */
-
+/////////////////////////////////////////////////////////////////////////
+//
+// InsetListings
+//
+/////////////////////////////////////////////////////////////////////////
 
-class InsetListings : public InsetCollapsable {
+/// A collapsable text inset for program listings.
+class InsetListings : public InsetCollapsable
+{
 public:
 	///
-	InsetListings(BufferParams const &, InsetListingsParams const & par = InsetListingsParams());
+	InsetListings(Buffer *, InsetListingsParams const & par = InsetListingsParams());
 	///
 	~InsetListings();
 	///
+	static void string2params(std::string const &, InsetListingsParams &);
+	///
+	static std::string params2string(InsetListingsParams const &);
+private:
+	///
+	bool isLabeled() const { return true; }
+	///
+	bool noFontChange() const { return true; }
+	///
 	InsetCode lyxCode() const { return LISTINGS_CODE; }
 	/// lstinline is inlined, normal listing is displayed
-	virtual DisplayType display() const;
+	DisplayType display() const;
 	///
 	docstring name() const { return from_ascii("Listings"); }
 	// Update the counters of this inset and of its contents
-	virtual void updateLabels(Buffer const &, ParIterator const &);
+	void updateBuffer(ParIterator const &, UpdateType);
 	///
-	void write(Buffer const & buf, std::ostream & os) const;
+	void write(std::ostream & os) const;
 	///
-	void read(Buffer const & buf, Lexer & lex);
+	void read(Lexer & lex);
 	///
-	virtual docstring const editMessage() const;
+	int latex(odocstream &, OutputParams const &) const;
 	///
-	bool isMacroScope(Buffer const & buf) const { return true; }
-	///
-	int latex(Buffer const &, odocstream &, OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 	///
@@ -56,46 +65,25 @@ public:
 	InsetListingsParams const & params() const { return params_; }
 	///
 	InsetListingsParams & params() { return params_; }
-protected:
-	InsetListings(InsetListings const &);
-	///
-	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
-	///
-	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
-private:
-	virtual Inset * clone() const;
 	///
-	void setButtonLabel();
+	docstring contextMenu(BufferView const & bv, int x, int y) const;
 	///
-	docstring getCaption(Buffer const &, OutputParams const &) const;
+	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
-	InsetListingsParams params_;
-};
-
-
-class InsetListingsMailer : public MailInset {
-public:
-	///
-	InsetListingsMailer(InsetListings & inset);
-	///
-	virtual Inset & inset() const { return inset_; }
-	///
-	virtual std::string const & name() const { return name_; }
+	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 	///
-	virtual std::string const inset2string(Buffer const &) const;
+	Inset * clone() const { return new InsetListings(*this); }
 	///
-	static void string2params(std::string const &,
-		InsetListingsParams &);
+	docstring const buttonLabel(BufferView const & bv) const;
 	///
-	static std::string const params2string(InsetListingsParams const &);
-private:
+	docstring getCaption(OutputParams const &) const;
 	///
-	static std::string const name_;
+	bool insetAllowed(InsetCode c) const { return c == CAPTION_CODE; } 
+
 	///
-	InsetListings & inset_;
+	InsetListingsParams params_;
 };
 
-
 } // namespace lyx
 
-#endif
+#endif // INSET_LISTINGS_H