fly/flightgear
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
mfranz 2005-12-06 18:46:39 +00:00
parent 5fa3420e36
commit eb68e9ad36
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/GUI/menubar.cxx
View file

@ -387,9 +387,6 @@ FGMenuBar::make_map(const SGPropertyNode * node)
if (!(obj->getType() & PUCLASS_ONESHOT)) if (!(obj->getType() & PUCLASS_ONESHOT))
continue; continue;
if (!obj->getLegend())
continue;
std::ostringstream menu; std::ostringstream menu;
menu << base << "/menu[" << menu_index << "]"; menu << base << "/menu[" << menu_index << "]";
SGPropertyNode *prop = fgGetNode(menu.str().c_str()); 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 // don't know yet how many will be usable; so we collect first
vector<puObject *> e; vector<puObject *> e;
for (puObject *me = ((puGroup *)popup)->getFirstChild(); for (puObject *me = ((puGroup *)popup)->getFirstChild();
me; me = me->getNextObject()) { me; me = me->getNextObject())
if (!me->getLegend())
continue;
e.push_back(me); e.push_back(me);
}
for (unsigned int i = 0; i < e.size(); i++) { for (unsigned int i = 0; i < e.size(); i++) {
std::ostringstream item; std::ostringstream item;

2
src/GUI/menubar.hxx
View file

@ -112,7 +112,7 @@ private:
// Create a property-path -> puObject map for menu node // Create a property-path -> puObject map for menu node
void make_map(const SGPropertyNode * 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); void add_enabled_listener(SGPropertyNode * node);
// Is the menu visible? // Is the menu visible?