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 dbe1904fc876cb5ab0b0f6dafd4a07674072e305..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,12 +162,12 @@ public:
     virtual FGDialog * getActiveDialog ();
 
     virtual FGColor *getColor (const char * name) const {
-        _itt_t it = _colors.find(name);
-        return it->second;
+        _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());
-        return it->second;
+        _citt_t it = _colors.find(name.c_str());
+        return (it != _colors.end()) ? it->second : NULL;
     }
 
     virtual puFont *getDefaultFont() { return &_font; }
@@ -193,10 +200,18 @@ protected:
     virtual void setupFont (SGPropertyNode *);
 
 private:
+    struct ltstr
+    {
+        bool operator()(const char* s1, const char* s2) const {
+            return strcmp(s1, s2) < 0;
+        }
+    };
+
     fntTexFont _tex_font;
     puFont _font;
-    map<const char*,FGColor*> _colors;
-    typedef map<const char*,FGColor*>::const_iterator _itt_t;
+    map<const char*,FGColor*, ltstr> _colors;
+    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 ();
@@ -217,15 +232,17 @@ public:
     FGColor() { clear(); }
     FGColor(float r, float g, float b, float a = 1.0f) { set(r, g, b, a); }
     FGColor(const SGPropertyNode *prop) { set(prop); }
-    FGColor(FGColor *c) { set(c->_red, c->_green, c->_blue, c->_alpha); }
+    FGColor(FGColor *c) { 
+        if (c) set(c->_red, c->_green, c->_blue, c->_alpha);
+    }
 
     inline void clear() { _red = _green = _blue = _alpha = -1.0f; }
     // merges in non-negative components from property with children <red> etc.
     bool merge(const SGPropertyNode *prop);
-    bool merge(const FGColor& color);
+    bool merge(const FGColor *color);
 
     bool set(const SGPropertyNode *prop) { clear(); return merge(prop); };
-    bool set(const FGColor& color) { clear(); return merge(color); }
+    bool set(const FGColor *color) { clear(); return merge(color); }
     bool set(float r, float g, float b, float a = 1.0f) {
         _red = r, _green = g, _blue = b, _alpha = a;
         return true;