Do not allow a program listing to be in a font changing command.

[lyx.git] / src / insets / InsetListings.h

diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index d21bda8ce6b538dac157e32c60f0e34d73ca4619..8883b98343b3738d1a514a8acc3475c0b064f756 100644 (file)
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -9,30 +9,40 @@
  * 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(Buffer 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
        DisplayType display() const;
@@ -45,10 +55,10 @@ public:
        ///
        void read(Lexer & lex);
        ///
-       docstring editMessage() const;
-       ///
        int latex(odocstream &, OutputParams const &) const;
        ///
+       docstring xhtml(odocstream &, OutputParams const &) const;
+       ///
        void validate(LaTeXFeatures &) const;
        ///
        bool showInsetDialog(BufferView *) const;
@@ -58,8 +68,6 @@ public:
        InsetListingsParams & params() { return params_; }
        ///
        docstring contextMenu(BufferView const & bv, int x, int y) const;
-
-private:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
@@ -67,37 +75,14 @@ private:
        ///
        Inset * clone() const { return new InsetListings(*this); }
        ///
-       void setButtonLabel();
+       docstring const buttonLabel(BufferView const & bv) const;
        ///
        docstring getCaption(OutputParams const &) const;
-       ///
-       InsetListingsParams params_;
-};
 
-
-class InsetListingsMailer : public MailInset {
-public:
-       ///
-       InsetListingsMailer(InsetListings & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
-       ///
-       virtual std::string const & name() const { return name_; }
-       ///
-       virtual std::string const inset2string(Buffer const &) const;
        ///
-       static void string2params(std::string const &,
-               InsetListingsParams &);
-       ///
-       static std::string const params2string(InsetListingsParams const &);
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetListings & inset_;
+       InsetListingsParams params_;
 };
 
-
 } // namespace lyx
 
-#endif
+#endif // INSET_LISTINGS_H