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 743380535a98ec32ee5d6e45c9eed632f3e503dd..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,8 +133,8 @@ private:
     // (PUCOL_LABEL, etc.) should pick up the <color> property.
     void setColor(puObject * object, SGPropertyNode * props, int which = 0);
 
-    // Expand some elements according to style templates.
-    void preprocess (SGPropertyNode * props);
+    // return key code number for keystring
+    int getKeyCode(const char *keystring);
 
     // The top-level PUI object.
     puObject * _object;
@@ -141,6 +142,18 @@ private:
     // 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
@@ -162,8 +175,6 @@ private:
     // dialog closes.
     char ** make_char_array (int size);
     vector<char **> _char_arrays;
-
-    SGPath _font_path;
 };
 
 //
@@ -180,7 +191,10 @@ class fgPopup : public puPopup {
 public:
     fgPopup(int x, int y, bool d = true) : puPopup(x, y) { _dragging = false; _draggable = d;}
     int checkHit(int b, int up, int x, int y);
+    int checkKey(int key, int updown);
     int getHitObjects(puObject *, int x, int y);
+    puObject *getKeyObject(puObject *, int key);
+    puObject *getActiveInputField(puObject *);
 private:
     bool _draggable;
     bool _dragging;