X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.h;h=07c115a2727d052cc42e978e9a084d38c3634c89;hb=848c89564fce9c4bfec79b915746dc6bc47abc3d;hp=ecec25559ef0f57de78990b661a0564f4240e077;hpb=f49f2f6e22a087a05904fe73b989daf26cc5e41e;p=lyx.git

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index ecec25559e..07c115a272 100644
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -14,7 +14,7 @@
 #define MENUBACKEND_H
 
 #include "FuncStatus.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include <boost/shared_ptr.hpp>
 
@@ -23,7 +23,7 @@
 
 namespace lyx {
 
-class LyXLex;
+class Lexer;
 class Buffer;
 class Menu;
 
@@ -72,6 +72,8 @@ public:
 		/** This is the list of selections that can
 		    be pasted. */
 		PasteRecent,
+		/** toolbars */
+		Toolbars,
 		/** Available branches in document */
 		Branches
 	};
@@ -108,8 +110,11 @@ public:
 	FuncStatus & status() { return status_; }
 	/// returns the status of the lfun associated with this entry
 	void status(FuncStatus const & status) { status_ = status; }
-	/// returns the binding associated to this action
-	docstring const binding() const;
+	/**
+	 * returns the binding associated to this action.
+	 * Use the native UI format when \c forgui is true.
+	 */
+	docstring const binding(bool forgui) const;
 	/// the description of the  submenu (if relevant)
 	docstring const & submenuname() const { return submenuname_; }
 	/// set the description of the  submenu
@@ -156,7 +161,7 @@ public:
 	/// menu item.
 	Menu & addWithStatusCheck(MenuItem const &);
 	///
-	Menu & read(LyXLex &);
+	Menu & read(Lexer &);
 	///
 	docstring const & name() const { return name_; }
 	///
@@ -200,9 +205,9 @@ public:
 	///
 	typedef MenuList::iterator iterator;
 	///
-	MenuBackend() : specialmenu_(0) {}
+	MenuBackend() {}
 	///
-	void read(LyXLex &);
+	void read(Lexer &);
 	///
 	void add(Menu const &);
 	///
@@ -216,10 +221,13 @@ public:
 	///
 	bool empty() const { return menulist_.empty(); }
 	/** This defines a menu whose entries list the FuncRequests
-	    will be removed by expand() in other menus. This is used by
-	    the Qt/Mac code
+	    that will be removed by expand() in other menus. This is
+	    used by the Qt/Mac code
 	*/
-	void specialMenu(docstring const &);
+	void specialMenu(Menu const &);
+	///
+	Menu const & specialMenu() { return specialmenu_; }
+
 	/// Expands some special entries of the menu
 	/** The entries with the following kind are expanded to a
 	    sequence of Command MenuItems: Lastfiles, Documents,
@@ -249,7 +257,7 @@ private:
 	///
 	Menu menubar_;
 	///
-	Menu * specialmenu_;
+	Menu specialmenu_;
 };
 
 ///