branch: Fix disabling of submenus that are empty.

see:
http://www.lyx.org/trac/changeset/28027

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29026 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-04-02 20:08:25 +00:00
parent 4b76c8267f
commit 4dd1fed397

View File

@ -339,8 +339,8 @@ void MenuDefinition::addWithStatusCheck(MenuItem const & i)
}
case MenuItem::Submenu: {
bool enabled = false;
if (i.hasSubmenu()) {
bool enabled = false;
for (const_iterator cit = i.submenu().begin();
cit != i.submenu().end(); ++cit) {
if ((cit->kind() == MenuItem::Command
@ -350,13 +350,11 @@ void MenuDefinition::addWithStatusCheck(MenuItem const & i)
break;
}
}
if (enabled || !i.optional()) {
items_.push_back(i);
items_.back().status().setEnabled(enabled);
}
}
else
if (enabled || !i.optional()) {
items_.push_back(i);
items_.back().status().setEnabled(enabled);
}
break;
}