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

diff --git a/src/frontends/xforms/Menubar_pimpl.h b/src/frontends/xforms/Menubar_pimpl.h
index 24c2606006..9ffce98ca3 100644
--- a/src/frontends/xforms/Menubar_pimpl.h
+++ b/src/frontends/xforms/Menubar_pimpl.h
@@ -19,6 +19,7 @@
 #endif
 
 #include <vector>
+#include <map>
 #include "LString.h"
 #include "frontends/Menubar.h"
 #include "commandtags.h"
@@ -26,8 +27,7 @@
 class LyXView;
 class MenuBackend;
 class MenuItem;
-
-#include "debug.h"
+class Menu;
 
 /** The LyX GUI independent menubar class
   The GUI interface is implemented in the corresponding Menubar_pimpl class. 
@@ -46,18 +46,6 @@ 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);
-	/** Add to "menu" the list of opened documents
-	    (add "extra_label" to the last entry)
-	*/
-	void add_documents(int menu, string const & extra_label);
-	/// Add to "menu" the list of exportable/viewable formats
-	/// (add "extra_label" to the last entry)
-	void add_formats(int menu, string const & extra_label,
-			 kb_action action, bool viewable);
 	///
 	void add_toc(int menu, string const & extra_label,
 		     std::vector<int> & smn, Window win);
@@ -72,15 +60,14 @@ public:
         /// 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, 
@@ -98,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