Moved some of the low level scene graph construction code over to simgear.

[flightgear.git] / src / GUI / menubar.cxx

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index 0fa6d496dce163cc0f7dd7ee3e86ac88274654fd..0164dd2d86a0796376ba377c2cb7503cf3532ea2 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -58,15 +58,6 @@ do_hires_snapshot_dialog (const SGPropertyNode * arg)
 }
 #endif // TR_HIRES_SNAP
 
-extern void dumpSnapShot (puObject *);
-static bool
-do_snapshot_dialog (const SGPropertyNode * arg)
-{
-    dumpSnapShot(0);
-    return true;
-}
-
-
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
 extern void printScreen (puObject *);
 static bool
@@ -101,62 +92,6 @@ do_properties_dialog (const SGPropertyNode * arg)
     return true;
 }
 
-extern void fgPresetAirport (puObject *);
-static bool
-do_preset_airport_dialog (const SGPropertyNode * arg)
-{
-    fgPresetAirport(0);
-    return true;
-}
-
-extern void fgPresetRunway (puObject *);
-static bool
-do_preset_runway_dialog (const SGPropertyNode * arg)
-{
-    fgPresetRunway(0);
-    return true;
-}
-
-extern void fgPresetOffsetDistance (puObject *);
-static bool
-do_preset_offset_distance_dialog (const SGPropertyNode * arg)
-{
-    fgPresetOffsetDistance(0);
-    return true;
-}
-
-extern void fgPresetAltitude (puObject *);
-static bool
-do_preset_altitude_dialog (const SGPropertyNode * arg)
-{
-    fgPresetAltitude(0);
-    return true;
-}
-
-extern void fgPresetGlideslope (puObject *);
-static bool
-do_preset_glideslope_dialog (const SGPropertyNode * arg)
-{
-    fgPresetGlideslope(0);
-    return true;
-}
-
-extern void fgPresetAirspeed (puObject *);
-static bool
-do_preset_airspeed_dialog (const SGPropertyNode * arg)
-{
-    fgPresetAirspeed(0);
-    return true;
-}
-
-extern void fgPresetCommit (puObject *);
-static bool
-do_preset_commit_dialog (const SGPropertyNode * arg)
-{
-    fgPresetCommit(0);
-    return true;
-}
-
 extern void AddWayPoint (puObject *);
 static bool
 do_ap_add_waypoint_dialog (const SGPropertyNode * arg)
@@ -211,24 +146,16 @@ static struct {
 } deprecated_dialogs [] = {
     { "old-save-dialog", do_save_dialog },
     { "old-load-dialog", do_load_dialog },
-    { "old-reinit_dialog", do_reinit_dialog },
+    { "old-reinit-dialog", do_reinit_dialog },
 #if defined(TR_HIRES_SNAP)
     { "old-hires-snapshot-dialog", do_hires_snapshot_dialog },
 #endif
-    { "old-snapshot-dialog", do_snapshot_dialog },
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
     { "old-print-dialog", do_print_dialog },
 #endif
     { "old-pilot-offset-dialog", do_pilot_offset_dialog },
     { "old-hud-alpha-dialog", do_hud_alpha_dialog },
     { "old-properties-dialog", do_properties_dialog },
-    { "old-preset-airport-dialog", do_preset_airport_dialog },
-    { "old-preset-runway-dialog", do_preset_runway_dialog },
-    { "old-preset-offset-distance-dialog", do_preset_offset_distance_dialog },
-    { "old-preset-altitude-dialog", do_preset_altitude_dialog },
-    { "old-preset-glideslope-dialog", do_preset_glideslope_dialog },
-    { "old-preset-airspeed-dialog", do_preset_airspeed_dialog },
-    { "old-preset-commit-dialog", do_preset_commit_dialog },
     { "old-ap-add-waypoint-dialog", do_ap_add_waypoint_dialog },
     { "old-ap-pop-waypoint-dialog", do_ap_pop_waypoint_dialog },
     { "old-ap-clear-route-dialog", do_ap_clear_route_dialog },
@@ -281,12 +208,12 @@ FGMenuBar::~FGMenuBar ()
     hide();
     puDeleteObject(_menuBar);
 
-    int i;
+    unsigned int i;
 
                                 // Delete all the character arrays
                                 // we were forced to keep around for
                                 // plib.
-    std::cerr << "Deleting char arrays\n";
+    SG_LOG(SG_GENERAL, SG_INFO, "Deleting char arrays");
     for (i = 0; i < _char_arrays.size(); i++) {
         for (int j = 0; _char_arrays[i][j] != 0; j++)
             free(_char_arrays[i][j]); // added with strdup
@@ -296,21 +223,21 @@ FGMenuBar::~FGMenuBar ()
                                 // Delete all the callback arrays
                                 // we were forced to keep around for
                                 // plib.
-    std::cerr << "Deleting callback arrays\n";
+    SG_LOG(SG_GENERAL, SG_INFO, "Deleting callback arrays");
     for (i = 0; i < _callback_arrays.size(); i++)
         delete _callback_arrays[i];
 
                                 // Delete all those bindings
-    std::cerr << "Deleting bindings\n";
+    SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings");
     map<string,vector<FGBinding *> >::iterator it;
     it = _bindings.begin();
     for (it = _bindings.begin(); it != _bindings.end(); it++) {
-        std::cerr << "Deleting bindings for " << it->first << std::endl;
-        for (int i = 0; i < it->second.size(); i++)
+        SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings for " << it->first);
+        for ( i = 0; i < it->second.size(); i++ )
             delete it->second[i];
     }
 
-    std::cerr << "Done.\n";
+    SG_LOG(SG_GENERAL, SG_INFO, "Done.");
 }
 
 void
@@ -359,7 +286,7 @@ FGMenuBar::fireItem (puObject * item)
 }
 
 void
-FGMenuBar::make_menu (SGPropertyNode_ptr node)
+FGMenuBar::make_menu (SGPropertyNode * node)
 {
     const char * name = strdup(node->getStringValue("label"));
     vector<SGPropertyNode_ptr> item_nodes = node->getChildren("item");
@@ -369,7 +296,7 @@ FGMenuBar::make_menu (SGPropertyNode_ptr node)
     char ** items = make_char_array(array_size);
     puCallback * callbacks = make_callback_array(array_size);
 
-    for (int i = 0, j = item_nodes.size() - 1;
+    for (unsigned int i = 0, j = item_nodes.size() - 1;
          i < item_nodes.size();
          i++, j--) {
         
@@ -381,7 +308,7 @@ FGMenuBar::make_menu (SGPropertyNode_ptr node)
         vector<SGPropertyNode_ptr> binding_nodes =
             item_nodes[i]->getChildren("binding");
 
-        for (int k = 0; k < binding_nodes.size(); k++)
+        for (unsigned int k = 0; k < binding_nodes.size(); k++)
             _bindings[items[j]].push_back(new FGBinding(binding_nodes[k]));
     }
 
@@ -396,7 +323,7 @@ FGMenuBar::make_menubar ()
 
     fgLoadProps("gui/menubar.xml", &props);
     vector<SGPropertyNode_ptr> menu_nodes = props.getChildren("menu");
-    for (int i = 0; i < menu_nodes.size(); i++)
+    for (unsigned int i = 0; i < menu_nodes.size(); i++)
         make_menu(menu_nodes[i]);
 
     _menuBar->close();