From: mfranz Date: Tue, 6 Dec 2005 18:46:39 +0000 (+0000) Subject: remove two checks that were only useful during development; fix typo X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eb68e9ad36b5429509e4aa6bf8dc033af82db48b;p=flightgear.git remove two checks that were only useful during development; fix typo --- diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx index f500e4342..04dc67634 100644 --- 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 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 0c77c3af8..9830ebbbb 100644 --- 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 listener that enables/disabled menu entries. + // Add listener that enables/disables menu entries. void add_enabled_listener(SGPropertyNode * node); // Is the menu visible?