X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FToolbarBackend.h;h=7d9fc9f6b914729081bd8c95f033a996287efb0a;hb=cd4033aef3a3f1efdb5a676b8bab3d367f53a830;hp=8169ea910a9f60d4541cf84c06f1f8a14a025791;hpb=3bcf40e96d29e9a75db0f6d6fa933ea8f124f6e3;p=lyx.git

diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index 8169ea910a..7d9fc9f6b9 100644
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -18,6 +18,9 @@
 #include <vector>
 
 
+namespace lyx {
+
+
 class LyXLex;
 
 
@@ -35,7 +38,7 @@ public:
 	};
 
 	/// action, tooltip
-	typedef std::pair<FuncRequest, std::string> Item;
+	typedef std::pair<FuncRequest, docstring> Item;
 
 	/// the toolbar items
 	typedef std::vector<Item> Items;
@@ -49,7 +52,9 @@ public:
 		TOP = 16, //< show at top
 		BOTTOM = 32, //< show at bottom
 		LEFT = 64, //< show at left
-		RIGHT = 128 //< show at right
+		RIGHT = 128, //< show at right
+		REVIEW = 256, //< shown when change tracking is enabled
+		AUTO = 512  //< only if AUTO is set, will MATH, TABLE and REIVEW is used
 	};
 
 	/// a toolbar
@@ -71,13 +76,13 @@ public:
 	ToolbarBackend();
 
 	/// iterator for all toolbars
-	Toolbars::const_iterator begin() const {
-		return usedtoolbars.begin();
-	}
+	Toolbars::const_iterator begin() const { return usedtoolbars.begin(); }
+
+	Toolbars::const_iterator end() const { return usedtoolbars.end(); }
 
-	Toolbars::const_iterator end() const {
-		return usedtoolbars.end();
-	}
+	Toolbars::iterator begin() { return usedtoolbars.begin(); }
+
+	Toolbars::iterator end() { return usedtoolbars.end(); }
 
 	/// read a toolbar from the file
 	void read(LyXLex &);
@@ -91,7 +96,7 @@ public:
 private:
 	/// add the given lfun with tooltip if relevant
 	void add(Toolbar & tb, FuncRequest const &,
-		 std::string const & tooltip = std::string());
+		 docstring const & tooltip = docstring());
 
 	/// all the toolbars
 	Toolbars toolbars;
@@ -104,4 +109,7 @@ private:
 extern ToolbarBackend toolbarbackend;
 
 
+
+} // namespace lyx
+
 #endif // TOOLBAR_BACKEND_H