X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FToolbarBackend.h;h=95dc8900b726e9021a1ff9aabf19d1907c8ccb57;hb=2417d9d911dbca181c48f45d1aad26d31c9aa815;hp=6149a6f99b4fc789ff774b3333044bcb5129d976;hpb=f73cedc1d0b2fd6b822c55c7537d01308859079e;p=lyx.git

diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index 6149a6f99b..95dc8900b7 100644
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -13,7 +13,7 @@
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include <vector>
 
@@ -21,7 +21,7 @@
 namespace lyx {
 
 
-class LyXLex;
+class Lexer;
 
 class ToolbarItem {
 public:
@@ -35,7 +35,11 @@ public:
 		/// a special combox insead of a button
 		LAYOUTS,
 		/// a special widget to insert tabulars
-		TABLEINSERT
+		TABLEINSERT,
+		///
+		POPUPMENU,
+		///
+		ICONPALETTE
 	};
 
 	ToolbarItem(Type type,
@@ -93,7 +97,7 @@ public:
 	Flags flags;
 
 	/// read a toolbar from the file
-	ToolbarInfo & read(LyXLex &);
+	ToolbarInfo & read(Lexer &);
 
 private:
 	/// add toolbar item
@@ -118,17 +122,18 @@ public:
 	Toolbars::iterator end() { return usedtoolbars.end(); }
 
 	/// read toolbars from the file
-	void readToolbars(LyXLex &);
+	void readToolbars(Lexer &);
 
 	/// read ui toolbar settings
-	void readToolbarSettings(LyXLex &);
+	void readToolbarSettings(Lexer &);
+
 	///
-	ToolbarInfo const & getToolbar(std::string const & name) const;
+	ToolbarInfo const * getDefinedToolbarInfo(std::string const & name) const;
 	///
-	ToolbarInfo & getToolbar(std::string const & name);
+	ToolbarInfo * getUsedToolbarInfo(std::string const & name);
 
 private:
-	/// all the toolbars
+	/// all the defined toolbars
 	Toolbars toolbars;
 
 	/// toolbars listed