From 4054f92114146e1d3f60c97b09c2d022fc9f72ba Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 18 Dec 2002 16:56:38 +0000 Subject: [PATCH] small tweak to menu changes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5860 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/Menubar_pimpl.C | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 528991083d..faf5cabaa0 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2002-12-18 Jean-Marc Lasgouttes + + * Menubar_pimpl.C (create_submenu): do not query the status of a + separator. + 2002-12-18 Lars Gullik Bjønnes * forms/Makefile.am (EXTRA_DIST): dist the .fd files. diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index cdc668d794..56db1c5f4c 100644 --- a/src/frontends/xforms/Menubar_pimpl.C +++ b/src/frontends/xforms/Menubar_pimpl.C @@ -231,12 +231,15 @@ int Menubar::Pimpl::create_submenu(Window win, XFormsView * view, vector::iterator it = extra_labels.begin(); vector::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(); -- 2.39.5