remove two checks that were only useful during development; fix typo

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index f500e43423d4b5293e0c1650903bb1745dd36a45..04dc676340b2bd010e980b2b045e027ed314c614 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -387,9 +387,6 @@ FGMenuBar::make_map(const SGPropertyNode * node)
         if (!(obj->getType() & PUCLASS_ONESHOT))
             continue;
 
-        if (!obj->getLegend())
-            continue;
-
         std::ostringstream menu;
         menu << base << "/menu[" << menu_index << "]";
         SGPropertyNode *prop = fgGetNode(menu.str().c_str());
@@ -411,13 +408,8 @@ FGMenuBar::make_map(const SGPropertyNode * node)
         // don't know yet how many will be usable; so we collect first
         vector<puObject *> e;
         for (puObject *me = ((puGroup *)popup)->getFirstChild();
-                me; me = me->getNextObject()) {
-
-            if (!me->getLegend())
-                continue;
-
+                me; me = me->getNextObject())
             e.push_back(me);
-        }
 
         for (unsigned int i = 0; i < e.size(); i++) {
             std::ostringstream item;

diff --git a/src/GUI/menubar.hxx b/src/GUI/menubar.hxx
index 0c77c3af8635e03580aaa9674adf083375043917..9830ebbbbc6821181c379d1b6934dec5b514437e 100644 (file)
--- a/src/GUI/menubar.hxx
+++ b/src/GUI/menubar.hxx
@@ -112,7 +112,7 @@ private:
     // Create a property-path -> puObject map for menu node
     void make_map(const SGPropertyNode * node);
 
-    // Add <enabled> listener that enables/disabled menu entries.
+    // Add <enabled> listener that enables/disables menu entries.
     void add_enabled_listener(SGPropertyNode * node);
 
     // Is the menu visible?