Update Mac configure script for new ALUT scheme; support --with-alut-framework.

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

diff --git a/src/GUI/menubar.hxx b/src/GUI/menubar.hxx
index 9830ebbbbc6821181c379d1b6934dec5b514437e..eab4b7ff8c6d939b700fe5d1a71e6615fb45d100 100644 (file)
--- a/src/GUI/menubar.hxx
+++ b/src/GUI/menubar.hxx
@@ -8,19 +8,20 @@
 #endif
 
 #include <simgear/compiler.h>  // for SG_USING_STD
+#include <Main/fg_props.hxx>
 
 #include <plib/pu.h>
 
 #include <map>
-SG_USING_STD(map);
+using std::map;
 
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 
 class puMenuBar;
 class puObject;
-class FGBinding;
+class SGBinding;
 
 
 /**
@@ -87,7 +88,7 @@ public:
     /**
      * create a menubar based on a PropertyList within the PropertyTree
      */
-    void make_menubar (const SGPropertyNode * props);
+    void make_menubar (SGPropertyNode * props);
 
 
     /**
@@ -95,6 +96,7 @@ public:
      */
     void destroy_menubar ();
 
+
     /**
      * Disable/enable menu titles and entries
      */
@@ -110,7 +112,7 @@ private:
     void make_menubar ();
 
     // Create a property-path -> puObject map for menu node
-    void make_map(const SGPropertyNode * node);
+    void make_object_map(SGPropertyNode * node);
 
     // Add <enabled> listener that enables/disables menu entries.
     void add_enabled_listener(SGPropertyNode * node);
@@ -122,7 +124,7 @@ private:
     puMenuBar * _menuBar;
 
     // A map of bindings for the menubar.
-    map<string,vector<FGBinding *> > _bindings;
+    map<string,vector<SGBinding *> > _bindings;
 
     // These are hoops that we have to jump through because PUI doesn't
     // do memory management for lists.  We have to allocate the arrays,
@@ -133,7 +135,8 @@ private:
     vector<char **> _char_arrays;
     vector<puCallback *> _callback_arrays;
 
-    map<string, puObject *> _entries;
+    // A map for {menu node path}->puObject translation.
+    map<string, puObject *> _objects;
 };
 
 #endif // __MENUBAR_HXX