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 5df7b15d3280e209ea6db6b93a524d1fd2c264fa..c62fbdd52bbaa3b717ae869a83f9dd5521bae214 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -45,7 +45,7 @@ public:
        ///
        virtual docstring const editMessage() const;
        ///
-       Inset::Code lyxCode() const { return Inset::BRANCH_CODE; }
+       InsetCode lyxCode() const { return BRANCH_CODE; }
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
@@ -53,7 +53,7 @@ public:
        ///
        void setButtonLabel();
        ///
-       virtual Color_color backgroundColor() const;
+       virtual ColorCode backgroundColor() const;
        ///
        bool showInsetDialog(BufferView *) const;
        ///
@@ -80,7 +80,12 @@ 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 &);
@@ -91,10 +96,8 @@ protected:
 private:
        friend class InsetBranchParams;
 
-       virtual std::auto_ptr<Inset> doClone() const;
+       virtual Inset * clone() const;
 
-       /// used by the constructors
-       void init();
        ///
        InsetBranchParams params_;
 };