X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBranch.h;h=c62fbdd52bbaa3b717ae869a83f9dd5521bae214;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=37d79973716b9dc485ce921dc8795257a810bdf8;hpb=39e79d8602920eefe36e898c9f415afb979521b2;p=lyx.git

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 37d7997371..c62fbdd52b 100644
--- 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;
 	///
@@ -77,18 +79,25 @@ public:
 	 */
 	bool isBranchSelected(Buffer const & buffer) const;
 	///
-	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) 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(LCursor & cur, FuncRequest & cmd);
+	///
+	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_; }
 	///