Don't restore initial screen geometry because there is nothing in fg_os* to resize...

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

diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index 26b89bb96566aff10e6f9de377be3b278b4abfba..0bad5ad18c60c778045dc7b12bd99d8b463d0600 100644 (file)
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -108,7 +108,8 @@ private:
         HIGHLIGHT = 0x04,
         LABEL = 0x08,
         LEGEND = 0x10,
-        MISC = 0x20
+        MISC = 0x20,
+        EDITFIELD = 0x40
     };
 
     // Private copy constructor to avoid unpleasant surprises.
@@ -132,12 +133,27 @@ private:
     // (PUCOL_LABEL, etc.) should pick up the <color> property.
     void setColor(puObject * object, SGPropertyNode * props, int which = 0);
 
+    // return key code number for keystring
+    int getKeyCode(const char *keystring);
+
     // The top-level PUI object.
     puObject * _object;
 
     // The GUI subsystem.
     NewGUI * _gui;
 
+    // The dialog font. Defaults to the global gui font, but can get
+    // overridden by a top level font definition.
+    puFont * _font;
+
+    // The source xml tree, so that we can pass data back, such as the
+    // last position.
+    SGPropertyNode_ptr _props;
+
+    // Nasal module.
+    string _module;
+    SGPropertyNode_ptr _nasal_close;
+
     // PUI provides no way for userdata to be deleted automatically
     // with a GUI object, so we have to keep track of all the special
     // data we allocated and then free it manually when the dialog
@@ -159,8 +175,6 @@ private:
     // dialog closes.
     char ** make_char_array (int size);
     vector<char **> _char_arrays;
-
-    SGPath _font_path;
 };
 
 //