remove noload/don't typeset

[lyx.git] / src / MenuBackend.h

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index 6f4bf989dbc9dc96acaf734fd1a4ce17284c662a..12e38bf0a67112745b2526f8b2cf23dd0d586567 100644 (file)
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -20,9 +20,11 @@
 
 #include "LString.h"
 #include <vector>
+#include <boost/shared_ptr.hpp>
 
 class LyXLex;
 class Buffer;
+class Menu;
 
 ///
 class MenuItem {
@@ -70,10 +72,10 @@ public:
        MenuItem(Kind kind,
                 string const & label,
                 int action,
-                bool optional = false)
-               : kind_(kind), label_(label),
-                 action_(action), submenu_(), optional_(optional) {}
+                bool optional = false);
 
+       /// This one is just to please boost::shared_ptr<>
+       ~MenuItem();
        /// The label of a given menuitem
        string const label() const;
        /// The keyboard shortcut (usually underlined in the entry)
@@ -84,11 +86,19 @@ public:
        Kind kind() const { return kind_; }
        /// the action (if relevant)
        int action() const { return action_; }
-       /// the description of the  submenu (if relevant)
-       string const & submenu() const { return submenu_; }
        /// returns true if the entry should be ommited when disabled
        bool optional() const { return optional_; }
+       /// the description of the  submenu (if relevant)
+       string const & submenuname() const { return submenuname_; }
+       /// the description of the  submenu (if relevant)
+       void submenuname(string const & name) { submenuname_ = name; }
+       ///
+       Menu * submenu() const { return submenu_.get(); }
+       ///
+       void submenu(Menu * menu);
+
 private:
+       //friend class MenuBackend;
        ///
        Kind kind_;
        ///
@@ -96,9 +106,11 @@ private:
        ///
        int action_;
        ///
-       string submenu_;
+       string submenuname_;
        ///
        bool optional_;
+       ///
+       boost::shared_ptr<Menu> submenu_;
 };
 
 
@@ -110,20 +122,14 @@ public:
        ///
        typedef ItemList::const_iterator const_iterator;
        ///
-       explicit Menu(string const & name = string(), bool mb = false)
-               : menubar_(mb), name_(name) {}
+       typedef ItemList::size_type size_type;
+       ///
+       explicit Menu(string const & name = string())
+               : name_(name) {}
        ///
        Menu & add(MenuItem const &);
        ///
        Menu & read(LyXLex &);
-       /// Expands some special entries of the menu
-       /** The entries with the following kind are expanded to a
-           sequence of Command MenuItems: Lastfiles, Documents,
-           ViewFormats, ExportFormats, UpdateFormats
-       */
-       void expand(Menu & tomenu, Buffer *) const;
-       ///
-       bool menubar() const { return menubar_; }
        ///
        string const & name() const { return name_; }
        ///
@@ -148,8 +154,6 @@ private:
        ///
        ItemList items_;
        ///
-       bool menubar_;
-       ///
        string name_;
 };
 
@@ -173,8 +177,17 @@ public:
        Menu & getMenu (string const &);
        ///
        Menu const & getMenu (string const &) const;
-       //
+       ///
+       Menu const & getMenubar() const;
+       ///
        bool empty() const { return menulist_.empty(); }
+       /// Expands some special entries of the menu
+       /** The entries with the following kind are expanded to a
+           sequence of Command MenuItems: Lastfiles, Documents,
+           ViewFormats, ExportFormats, UpdateFormats
+       */
+       void expand(Menu const & frommenu, Menu & tomenu,
+                   Buffer const *) const;
        ///
        const_iterator begin() const {
                return menulist_.begin();
@@ -186,6 +199,8 @@ public:
 private:
        ///
        MenuList menulist_;
+       ///
+       Menu menubar_;
 };
 
 ///