Tiny clean-ups.

[lyx.git] / src / frontends / xforms / XFormsMenubar.h

diff --git a/src/frontends/xforms/XFormsMenubar.h b/src/frontends/xforms/XFormsMenubar.h
index 848e384c55e59ae80812f4beee96ede9ffafa3a4..d43061d71bfced7b0b686b9d5c051cf0773b043c 100644 (file)
--- a/src/frontends/xforms/XFormsMenubar.h
+++ b/src/frontends/xforms/XFormsMenubar.h
@@ -12,7 +12,7 @@
 #ifndef XFORMSMENUBAR_H
 #define XFORMSMENUBAR_H
 
-#include "LString.h"
+#include "funcrequest.h"
 #include "frontends/Menubar.h"
 
 #include <boost/shared_ptr.hpp>
@@ -21,7 +21,7 @@
 #include <X11/X.h> // Window
 
 #include <vector>
-#include <map>
+
 
 class LyXView;
 class XFormsView;
@@ -31,6 +31,8 @@ class MenuBackend;
 
 class XFormsMenubar : public Menubar {
 public:
+       ///
+       typedef std::vector<FuncRequest> Funcs;
        ///
        XFormsMenubar(LyXView *, MenuBackend const &);
        ///
@@ -40,21 +42,22 @@ public:
        void update();
 
        /// Opens a top-level submenu given its name
-       void openByName(string const &);
+       void openByName(std::string const &);
 
        ///
        static void MenuCallback(FL_OBJECT *, long);
 
 private:
        ///
-       void add_toc(int menu, string const & extra_label,
+       void add_toc(int menu, std::string const & extra_label,
                     std::vector<int> & smn, Window win);
        ///
-       void add_references(int menu, string const & extra_label,
+       void add_references(int menu, std::string const & extra_label,
                            std::vector<int> & smn, Window win);
        ///
        int create_submenu(Window win, XFormsView * view,
-                          Menu const & menu, std::vector<int> & smn);
+                          Menu const & menu,
+                          std::vector<int> & smn, Funcs & funcs);
 
        //
        void makeMenubar(Menu const & menu);