small tweak to menu changes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5860 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-12-18 16:56:38 +00:00
parent 58ba213c69
commit 4054f92114
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2002-12-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* Menubar_pimpl.C (create_submenu): do not query the status of a
separator.
2002-12-18 Lars Gullik Bjønnes <larsbj@birdstep.com>
* forms/Makefile.am (EXTRA_DIST): dist the .fd files.

View File

@ -231,12 +231,15 @@ int Menubar::Pimpl::create_submenu(Window win, XFormsView * view,
vector<string>::iterator it = extra_labels.begin();
vector<string>::iterator last = it;
for (Menu::const_iterator i = menu.begin(); i != end; ++i, ++it) {
FuncStatus flag = view->getLyXFunc().getStatus(i->action());
if (i->kind() == MenuItem::Separator)
*last = "%l";
else if (!(i->optional() && flag.disabled())
&& ! flag.unknown())
last = it;
else {
FuncStatus flag
= view->getLyXFunc().getStatus(i->action());
if (!(i->optional() && flag.disabled())
&& ! flag.unknown())
last = it;
}
}
it = extra_labels.begin();