mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-26 19:25:39 +00:00
fix the fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5049 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
375e2ac1a0
commit
1ac835206a
@ -82,7 +82,7 @@ MenuItem::MenuItem(Kind kind, string const & label,
|
||||
|
||||
|
||||
MenuItem::MenuItem(Kind kind, string const & label, int action,
|
||||
bool optional = false);
|
||||
bool optional = false)
|
||||
: kind_(kind), label_(label), action_(action), submenuname_(),
|
||||
optional_(optional)
|
||||
{}
|
||||
@ -92,6 +92,12 @@ MenuItem::~MenuItem()
|
||||
{}
|
||||
|
||||
|
||||
void MenuItem::submenu(Menu * menu)
|
||||
{
|
||||
submenu_.reset(menu);
|
||||
}
|
||||
|
||||
|
||||
string const MenuItem::label() const
|
||||
{
|
||||
return token(label_, '|', 0);
|
||||
@ -111,12 +117,6 @@ Menu & Menu::add(MenuItem const & i)
|
||||
}
|
||||
|
||||
|
||||
void Menu::submenu(Menu * menu)
|
||||
{
|
||||
submenu_.reset(menu);
|
||||
}
|
||||
|
||||
|
||||
Menu & Menu::read(LyXLex & lex)
|
||||
{
|
||||
enum Menutags {
|
||||
|
Loading…
Reference in New Issue
Block a user