From 1990db9ca504a661e575b8139bfbc6a18d2eaffe Mon Sep 17 00:00:00 2001 From: mfranz Date: Tue, 6 Dec 2005 21:03:15 +0000 Subject: [PATCH] yet more cleanup; clearer warning messages --- src/GUI/menubar.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx index fa3d69d56..6b229b510 100644 --- a/src/GUI/menubar.cxx +++ b/src/GUI/menubar.cxx @@ -386,7 +386,7 @@ FGMenuBar::make_map(SGPropertyNode * node) SGPropertyNode *menu = node->getNode("menu", menu_index, false); if (!menu) { - SG_LOG(SG_GENERAL, SG_WARN, " without node: " + SG_LOG(SG_GENERAL, SG_WARN, "'menu' object without node: " << node->getPath() << "/menu[" << menu_index << ']'); continue; } @@ -394,21 +394,20 @@ FGMenuBar::make_map(SGPropertyNode * node) _entries[menu->getPath()] = obj; add_enabled_listener(menu); - puPopupMenu *popup = (puPopupMenu *)obj->getUserData(); + puGroup *popup = (puGroup *)obj->getUserData(); if (!popup) continue; // the entries are for some reason reversed (last first), and we // 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()) + for (puObject *me = popup->getFirstChild(); me; me = me->getNextObject()) e.push_back(me); for (unsigned int i = 0; i < e.size(); i++) { SGPropertyNode *item = menu->getNode("item", e.size() - i - 1, false); if (!item) { - SG_LOG(SG_GENERAL, SG_WARN, "menu without node: " + SG_LOG(SG_GENERAL, SG_WARN, "'item' object without node: " << menu->getPath() << "/item[" << i << ']'); continue; }