small tweak to menu changes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5860 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 528991083dc0262b1ac97d5fb50c41968b7119c1..faf5cabaa041b47dcff4d803fb4382018be86bc6 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -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.

diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index cdc668d7941f8edec2256f74e5d652326ea13c71..56db1c5f4cc433777ec29910829b846e9903a001 100644 (file)
--- 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<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();