don't destroy iterated map entries; delete _menubar; restore closed

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

diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx
index 8cc39b4753d960246e44a39243d86f547e5915e1..980b7871f86d2420e812f5bcc4a442c82831bdb0 100644 (file)
--- a/src/GUI/new_gui.hxx
+++ b/src/GUI/new_gui.hxx
@@ -133,6 +133,13 @@ public:
      */
     virtual bool closeDialog (const string &name);
 
+    /**
+     * Get dialog property tree's root node.
+     * @param name The name of the dialog box.
+     * @return node pointer if the dialog was found, zero otherwise.
+     */
+    virtual SGPropertyNode_ptr getDialog (const string &name);
+
     /**
      * Return a pointer to the current menubar.
      */
@@ -155,11 +162,11 @@ public:
     virtual FGDialog * getActiveDialog ();
 
     virtual FGColor *getColor (const char * name) const {
-        _itt_t it = _colors.find(name);
+        _citt_t it = _colors.find(name);
         return (it != _colors.end()) ? it->second : NULL;
     }
     virtual FGColor *getColor (const string &name) const {
-        _itt_t it = _colors.find(name.c_str());
+        _citt_t it = _colors.find(name.c_str());
         return (it != _colors.end()) ? it->second : NULL;
     }
 
@@ -203,7 +210,8 @@ private:
     fntTexFont _tex_font;
     puFont _font;
     map<const char*,FGColor*, ltstr> _colors;
-    typedef map<const char*,FGColor*, ltstr>::const_iterator _itt_t;
+    typedef map<const char*,FGColor*, ltstr>::iterator _itt_t;
+    typedef map<const char*,FGColor*, ltstr>::const_iterator _citt_t;
 
     // Free all allocated memory.
     void clear ();