X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.h;h=33e9d57b45c181bdf90ebfba02933eae83ce3f3f;hb=4056f0ddb150d0e5d60bc5941d51e365eed0ac86;hp=bfb3833bf6eb06bbd9eeb759641afdf97170235c;hpb=7bf7a111b1efb4d4f4a95a2b62d576cc715d97cc;p=lyx.git

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index bfb3833bf6..33e9d57b45 100644
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -19,6 +19,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include <vector>
+#include <stack>
 
 
 namespace lyx {
@@ -116,11 +117,8 @@ 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.
-	 * Use the native UI format when \c forgui is true.
-	 */
-	docstring const binding(bool forgui) const;
+	///returns the binding associated to this action.
+	docstring const binding() const;
 	/// the description of the  submenu (if relevant)
 	docstring const & submenuname() const { return submenuname_; }
 	/// set the description of the  submenu
@@ -159,8 +157,7 @@ public:
 	///
 	typedef ItemList::size_type size_type;
 	///
-	explicit Menu(docstring const & name = docstring())
-		: name_(name) {}
+	explicit Menu(docstring const & name = docstring()) : name_(name) {}
 	/// Add the menu item unconditionally
 	Menu & add(MenuItem const &);
 	/// Checks the associated FuncRequest status before adding the
@@ -181,16 +178,16 @@ public:
 	///
 	bool hasFunc(FuncRequest const &) const;
 	///
-	const_iterator begin() const {
-		return items_.begin();
-	}
+	const_iterator begin() const { return items_.begin(); }
 	///
-	const_iterator end() const {
-		return items_.end();
-	}
+	const_iterator end() const { return items_.end(); }
 
 	// Check whether the menu shortcuts are unique
 	void checkShortcuts() const;
+	
+	// search for func in this menu iteratively, and put menu
+	// names in a stack.
+	bool searchFunc(FuncRequest & func, std::stack<docstring> & names) const;
 
 private:
 	friend class MenuBackend;
@@ -242,21 +239,14 @@ public:
 	void expand(Menu const & frommenu, Menu & tomenu,
 		    Buffer const *) const;
 	///
-	const_iterator begin() const {
-		return menulist_.begin();
-	}
+	const_iterator begin() const { return menulist_.begin(); }
 	///
-	iterator begin() {
-		return menulist_.begin();
-	}
+	iterator begin() { return menulist_.begin(); }
 	///
-	const_iterator end() const {
-		return menulist_.end();
-	}
+	const_iterator end() const { return menulist_.end(); }
 	///
-	iterator end() {
-		return menulist_.end();
-	}
+	iterator end() { return menulist_.end(); }
+
 private:
 	///
 	MenuList menulist_;
@@ -266,10 +256,6 @@ private:
 	Menu specialmenu_;
 };
 
-///
-extern MenuBackend menubackend;
-
-
 } // namespace lyx
 
-#endif /* MENUBACKEND_H */
+#endif // MENUBACKEND_H