fly/flightgear
1
0
Fork 0
Code Activity

yet more cleanup; clearer warning messages

Browse source
This commit is contained in:
mfranz 2005-12-06 21:03:15 +00:00
parent c10f583c11
commit 1990db9ca5
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/GUI/menubar.cxx
View file

@ -386,7 +386,7 @@ FGMenuBar::make_map(SGPropertyNode * node)
SGPropertyNode *menu = node->getNode("menu", menu_index, false); SGPropertyNode *menu = node->getNode("menu", menu_index, false);
if (!menu) { if (!menu) {
SG_LOG(SG_GENERAL, SG_WARN, "<menu> without node: " SG_LOG(SG_GENERAL, SG_WARN, "'menu' object without node: "
<< node->getPath() << "/menu[" << menu_index << ']'); << node->getPath() << "/menu[" << menu_index << ']');
continue; continue;
} }
@ -394,21 +394,20 @@ FGMenuBar::make_map(SGPropertyNode * node)
_entries[menu->getPath()] = obj; _entries[menu->getPath()] = obj;
add_enabled_listener(menu); add_enabled_listener(menu);
puPopupMenu *popup = (puPopupMenu *)obj->getUserData(); puGroup *popup = (puGroup *)obj->getUserData();
if (!popup) if (!popup)
continue; continue;
// the entries are for some reason reversed (last first), and we // the entries are for some reason reversed (last first), and we
// 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 = popup->getFirstChild(); me; me = me->getNextObject())
me; me = me->getNextObject())
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++) {
SGPropertyNode *item = menu->getNode("item", e.size() - i - 1, false); SGPropertyNode *item = menu->getNode("item", e.size() - i - 1, false);
if (!item) { if (!item) {
SG_LOG(SG_GENERAL, SG_WARN, "menu <item> without node: " SG_LOG(SG_GENERAL, SG_WARN, "'item' object without node: "
<< menu->getPath() << "/item[" << i << ']'); << menu->getPath() << "/item[" << i << ']');
continue; continue;
} }