popen tweaks; "no 0cm" patch from Herbert; fix disabled toggles in menus

[features.git] / src / frontends / xforms / Menubar_pimpl.C

diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index 868554508e511f3cf729c7cc199e21a89f07920f..4f48be04aad09731417575226d81aa1cfde326e0 100644 (file)
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -436,9 +436,8 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view,
 
                switch (item.kind()) {
                case MenuItem::Command: {
-                       FuncStatus flag = 
+                       FuncStatus const flag = 
                                view->getLyXFunc()->getStatus(item.action()); 
-
                        // handle optional entries.
                        if (item.optional() 
                            && (flag.disabled())) {
@@ -467,12 +466,12 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view,
                        
                        // Modify the entry using the function status
                        string pupmode;
-                       if (flag.disabled() || flag.unknown())
-                               pupmode += "%i";
                        if (flag.onoff(true))
                                pupmode += "%B";
                        if (flag.onoff(false))
                                pupmode += "%b";
+                       if (flag.disabled() || flag.unknown())
+                               pupmode += "%i";
                        label += pupmode;
 
                        // Finally the menu shortcut