X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FMenubar_pimpl.h;h=9ffce98ca3516e479529cdf4915a24c21d8413ba;hb=eba67bc3120dc301bf193c3f3b570f51f00a4654;hp=0b4a472264d800c06a2f07582c7a6be29f7075ba;hpb=9062ce972e562477eb64c294769747ebf386fa6c;p=lyx.git

diff --git a/src/frontends/xforms/Menubar_pimpl.h b/src/frontends/xforms/Menubar_pimpl.h
index 0b4a472264..9ffce98ca3 100644
--- a/src/frontends/xforms/Menubar_pimpl.h
+++ b/src/frontends/xforms/Menubar_pimpl.h
@@ -19,15 +19,15 @@
 #endif
 
 #include <vector>
+#include <map>
 #include "LString.h"
 #include "frontends/Menubar.h"
+#include "commandtags.h"
 #include FORMS_H_LOCATION
 class LyXView;
 class MenuBackend;
 class MenuItem;
-class StrPool;
-
-#include "debug.h"
+class Menu;
 
 /** The LyX GUI independent menubar class
   The GUI interface is implemented in the corresponding Menubar_pimpl class. 
@@ -46,34 +46,28 @@ public:
 	///
 	static void MenuCallback(FL_OBJECT *, long);
 
-	/** Add to "menu" the list of last opened files
-	    (add "extra_label" to the last entry)
-	*/
-	void add_lastfiles(int menu, string const & extra_label,
-			   std::vector<int> & smn, StrPool & strpool);
-	/** Add to "menu" the list of opened documents
-	    (add "extra_label" to the last entry)
-	*/
-	void add_documents(int menu, string const & extra_label,
-			   std::vector<int> & smn, StrPool & strpool);
 	///
-	int create_submenu(Window win, LyXView * view, 
-			   string const & menuname, 
-			   std::vector<int> & smn, StrPool & strpool);
+	void add_toc(int menu, string const & extra_label,
+		     std::vector<int> & smn, Window win);
+	///
+	void add_references(int menu, string const & extra_label,
+			    std::vector<int> & smn, Window win);
+	///
+	int create_submenu(Window win, LyXView * view,
+                           string const & menuname,
+                           std::vector<int> & smn);
 
         /// update the state of the menuitems
         void update() {}
-
 private:
-	///
-	FL_OBJECT * frame_;
+	//
+	void makeMenubar(Menu const &menu);
+
 	/// 
 	LyXView * owner_;
 	///
 	MenuBackend const * menubackend_;
 	///
-	string current_menu;
-	///
 	struct ItemInfo {
 		///
 		ItemInfo(Menubar::Pimpl * p, MenuItem const * i, 
@@ -91,5 +85,14 @@ private:
 	typedef std::vector<ItemInfo *> ButtonList;
 	///
 	ButtonList buttonlist_;
+
+	///
+	typedef std::map<string, FL_OBJECT *> MenubarMap;
+	///
+	MenubarMap menubarmap_;
+	///
+	string current_menu_name_;
+	///
+	FL_OBJECT * current_group_;
 };
 #endif