prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index ca173ab6d54794b02a34adad791857c2c317a8c0..f33f82b22500b4d78189b6adbf66d3f788490998 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -15,46 +15,93 @@
 
 #include "insetcollapsable.h"
 
-/** The PostIt note inset
+
+ struct InsetNoteParams {
+       ///
+       void write(std::ostream & os) const;
+       ///
+       void read(LyXLex & lex);
+       ///
+       string type;
+};
+
+
+/** The PostIt note inset, and other annotations
 
 */
 class InsetNote : public InsetCollapsable {
 public:
        ///
-       InsetNote(BufferParams const &);
-       ///
+
+
+       InsetNote(BufferParams const &, string const &);
+       /// Copy constructor
        InsetNote(InsetNote const &);
        ///
-       //InsetNote(InsetNote const &, bool same_id);
-       ///
-       Inset * clone(Buffer const &) const;
+       ~InsetNote();
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        string const editMessage() const;
        ///
-       Inset::Code lyxCode() const { return Inset::NOTE_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::NOTE_CODE; }
        ///
        void write(Buffer const *, std::ostream &) const;
        ///
+       void read(Buffer const * buf, LyXLex & lex);
+       ///
+       void setButtonLabel();
+       ///
+       dispatch_result InsetNote::localDispatch(FuncRequest const &);
+       /// show the note dialog
+       bool showInsetDialog(BufferView * bv) const;
+       ///
        int latex(Buffer const *, std::ostream &,
-                 LatexRunParams const &) const
-               { return 0; }
+                       LatexRunParams const &) const;
+       ///
+       int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const
-               { return 0; }
+       int docbook(Buffer const *, std::ostream &, bool) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool) const
-               { return 0; }
+       int ascii(Buffer const *, std::ostream &, int) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int) const
-               { return 0; }
+       void validate(LaTeXFeatures &) const;
        ///
-       void validate(LaTeXFeatures &) const {}
+       InsetNoteParams const & params() const { return params_; }
+
 private:
+       friend class InsetNoteParams;
+
        /// used by the constructors
        void init();
+       ///
+       InsetNoteParams params_;
+};
+
+#include "mailinset.h"
+
+class InsetNoteMailer : public MailInset {
+public:
+       ///
+       InsetNoteMailer(string const & name, InsetNote & inset);
+       ///
+       virtual InsetBase & inset() const { return inset_; }
+       ///
+       virtual string const & name() const { return name_; }
+       ///
+       virtual string const inset2string(Buffer const &) const;
+       ///
+       static string const params2string(string const &, InsetNoteParams const &);
+       ///
+       static void string2params(string const &, InsetNoteParams &);
 
+private:
+       ///
+       string const name_;
+       ///
+       InsetNote & inset_;
 };
 
+
+
 #endif