anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

menu disable fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5684 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-11-20 17:21:42 +00:00
parent d201c74d5d
commit 9ba1386ad6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2002-11-20 John Levon <levon@movementarian.org>
* QLPopupMenu.C: only check .disabled() on Commands
2002-11-20 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-11-20 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* QLPopupMenu.C (getLabel): show labels for menu entries * QLPopupMenu.C (getLabel): show labels for menu entries

9
src/frontends/qt2/QLPopupMenu.C
View File

@ -88,6 +88,7 @@ QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner,
} }
// FIXME: should all be in backend
bool QLPopupMenu::disabled(Menu * menu) bool QLPopupMenu::disabled(Menu * menu)
{ {
bool disable = true; bool disable = true;
@ -95,10 +96,10 @@ bool QLPopupMenu::disabled(Menu * menu)
Menu::const_iterator m = menu->begin(); Menu::const_iterator m = menu->begin();
Menu::const_iterator end = menu->end(); Menu::const_iterator end = menu->end();
for (; m != end; ++m) { for (; m != end; ++m) {
if (m->kind() == MenuItem::Submenu if (m->kind() == MenuItem::Submenu) {
&& !disabled(m->submenu())) { if (!disabled(m->submenu()))
disable = false; disable = false;
} else { } else if (m->kind() != MenuItem::Separator) {
FuncStatus const status = FuncStatus const status =
owner_->view()->getLyXFunc() owner_->view()->getLyXFunc()
.getStatus(m->action()); .getStatus(m->action());