From 9ba1386ad602600953d8e4216aaebb1f9cc66dcc Mon Sep 17 00:00:00 2001 From: John Levon Date: Wed, 20 Nov 2002 17:21:42 +0000 Subject: [PATCH] menu disable fix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5684 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/QLPopupMenu.C | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index f685a9670f..358e0b6272 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2002-11-20 John Levon + + * QLPopupMenu.C: only check .disabled() on Commands + 2002-11-20 Jean-Marc Lasgouttes * QLPopupMenu.C (getLabel): show labels for menu entries diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C index 9a623b0131..5c130876c4 100644 --- a/src/frontends/qt2/QLPopupMenu.C +++ b/src/frontends/qt2/QLPopupMenu.C @@ -88,6 +88,7 @@ QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner, } +// FIXME: should all be in backend bool QLPopupMenu::disabled(Menu * menu) { bool disable = true; @@ -95,10 +96,10 @@ bool QLPopupMenu::disabled(Menu * menu) Menu::const_iterator m = menu->begin(); Menu::const_iterator end = menu->end(); for (; m != end; ++m) { - if (m->kind() == MenuItem::Submenu - && !disabled(m->submenu())) { - disable = false; - } else { + if (m->kind() == MenuItem::Submenu) { + if (!disabled(m->submenu())) + disable = false; + } else if (m->kind() != MenuItem::Separator) { FuncStatus const status = owner_->view()->getLyXFunc() .getStatus(m->action()); -- 2.39.5