- Added ultra-light traffic is now a separate traffic class that can have its

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

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index f8ef4db7185eb1994b3b8d6f8b958dcc0cb52e6c..51ce861ea7a2276d4160e3b8b3eb2bea2ac62c7d 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -54,14 +54,6 @@ do_print_dialog (const SGPropertyNode * arg)
 }
 #endif
 
-extern void prop_pickerView (puObject *);
-static bool
-do_properties_dialog (const SGPropertyNode * arg)
-{
-    prop_pickerView(0);
-    return true;
-}
-
 extern void helpCb (puObject *);
 static bool
 do_help_dialog (const SGPropertyNode * arg)
@@ -81,7 +73,6 @@ static struct {
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
     { "old-print-dialog", do_print_dialog },
 #endif
-    { "old-properties-dialog", do_properties_dialog },
     { "old-help-dialog", do_help_dialog },
     { 0, 0 }
 };
@@ -165,7 +156,7 @@ void
 FGMenuBar::fireItem (puObject * item)
 {
     const char * name = item->getLegend();
-    vector<FGBinding *> &bindings = _bindings[name];
+    vector<SGBinding *> &bindings = _bindings[name];
     int nBindings = bindings.size();
 
     for (int i = 0; i < nBindings; i++)
@@ -197,13 +188,13 @@ FGMenuBar::make_menu (SGPropertyNode * node)
 
         for (unsigned int k = 0; k < bindings.size(); k++) {
             unsigned int m = 0;
-            SGPropertyNode *binding;
+            SGPropertyNode_ptr binding;
             while (dest->getChild("binding", m))
                 m++;
 
             binding = dest->getChild("binding", m, true);
             copyProperties(bindings[k], binding);
-            _bindings[items[j]].push_back(new FGBinding(binding));
+            _bindings[items[j]].push_back(new SGBinding(binding, globals->get_props()));
         }
     }
 
@@ -292,7 +283,7 @@ FGMenuBar::destroy_menubar ()
 
                                 // Delete all those bindings
     SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings");
-    map<string,vector<FGBinding *> >::iterator it;
+    map<string,vector<SGBinding *> >::iterator it;
     it = _bindings.begin();
     for (it = _bindings.begin(); it != _bindings.end(); it++) {
         SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings for " << it->first);