FGFontCache::initializeFonts() now portable across platform through the use of plib

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

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index 9cacef59c7d68e840ea3600eff0f12c569f49bc7..f7955dc159ebc90e6fc3280bb2cd44bc3290cdfd 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -156,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++)
@@ -188,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()));
         }
     }
 
@@ -283,8 +283,7 @@ FGMenuBar::destroy_menubar ()
 
                                 // Delete all those bindings
     SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings");
-    map<string,vector<FGBinding *> >::iterator it;
-    it = _bindings.begin();
+    map<string,vector<SGBinding *> >::iterator it;
     for (it = _bindings.begin(); it != _bindings.end(); it++) {
         SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings for " << it->first);
         for ( i = 0; i < it->second.size(); i++ )