This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 58e86b1af104ae7c86f674f38f2738c2609250e9..c62fbdd52bbaa3b717ae869a83f9dd5521bae214 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -45,7 +45,7 @@ public:
        ///
        virtual docstring const editMessage() const;
        ///
-       InsetBase::Code lyxCode() const { return InsetBase::BRANCH_CODE; }
+       InsetCode lyxCode() const { return BRANCH_CODE; }
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
@@ -53,16 +53,18 @@ public:
        ///
        void setButtonLabel();
        ///
+       virtual ColorCode backgroundColor() const;
+       ///
        bool showInsetDialog(BufferView *) const;
        ///
        int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                 OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+                   OutputParams const &) const;
        ///
        void textString(Buffer const & buf, odocstream &) const;
        ///
@@ -78,17 +80,24 @@ public:
        bool isBranchSelected(Buffer const & buffer) const;
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
-
+       ///
+       virtual void updateLabels(Buffer const &, ParIterator const &);
+       ///
+       bool isMacroScope(Buffer const & buf) const;
+       ///
+       docstring toolTip(BufferView const & bv, int x, int y) const;
 protected:
+       ///
        InsetBranch(InsetBranch const &);
+       ///
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+       ///
+       docstring name() const { return from_ascii("Branch"); }
 private:
        friend class InsetBranchParams;
 
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual Inset * clone() const;
 
-       /// used by the constructors
-       void init();
        ///
        InsetBranchParams params_;
 };
@@ -99,7 +108,7 @@ public:
        ///
        InsetBranchMailer(InsetBranch & inset);
        ///
-       virtual InsetBase & inset() const { return inset_; }
+       virtual Inset & inset() const { return inset_; }
        ///
        virtual std::string const & name() const { return name_; }
        ///