Remove color dependency of framed note, fix bug 3598

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

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index df4e7b4263853d40ef4ef5deda210e3b6810ca38..97cd5d4256a78f941c266b385302a7d38f2125b8 100644 (file)
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -50,9 +50,11 @@ public:
        ///
        virtual docstring const editMessage() const;
        ///
-       InsetBase::Code lyxCode() const { return InsetBase::NOTE_CODE; }
+       Inset::Code lyxCode() const { return Inset::NOTE_CODE; }
        ///
-       docstring getInsetName() const { return from_ascii("Note"); }
+       docstring name() const { return from_ascii("Note"); }
+       /// framed and shaded notes are displayed
+       virtual DisplayType display() const;
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
@@ -80,7 +82,7 @@ protected:
 private:
        friend class InsetNoteParams;
 
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual std::auto_ptr<Inset> doClone() const;
 
        /// used by the constructors
        void init();
@@ -94,7 +96,7 @@ public:
        ///
        InsetNoteMailer(InsetNote & inset);
        ///
-       virtual InsetBase & inset() const { return inset_; }
+       virtual Inset & inset() const { return inset_; }
        ///
        virtual std::string const & name() const { return name_; }
        ///