Fix line endings

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

diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index 0e3dc6c6f79eeaa8f1f4d1562ffd56711d40f92b..f9f51705f408706411062eda02e5f2215289b302 100644 (file)
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -12,12 +12,15 @@
 
 #include <simgear/compiler.h>  // for SG_USING_STD
 #include <simgear/props/props.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <vector>
 SG_USING_STD(vector);
 
 class FGDialog;
 class FGBinding;
+class NewGUI;
+class FGColor;
 
 
 /**
@@ -99,6 +102,16 @@ public:
 
 private:
 
+    enum {
+        BACKGROUND = 0x01,
+        FOREGROUND = 0x02,
+        HIGHLIGHT = 0x04,
+        LABEL = 0x08,
+        LEGEND = 0x10,
+        MISC = 0x20,
+        EDITFIELD = 0x40
+    };
+
     // Private copy constructor to avoid unpleasant surprises.
     FGDialog (const FGDialog &);
 
@@ -114,12 +127,29 @@ private:
 
     // Common configuration for all GUI group objects.
     void setupGroup (puGroup * group, SGPropertyNode * props,
-                     int width, int height, sgVec4 color,
-                     bool makeFrame = false);
+                     int width, int height, bool makeFrame = false);
+
+    // Set object colors: the "which" argument defines which color qualities
+    // (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 *_props;
+
     // 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
@@ -155,10 +185,14 @@ private:
 //
 class fgPopup : public puPopup {
 public:
-    fgPopup(int x, int y) : puPopup(x, y) { _dragging = false; }
+    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;
     int _dX, _dY;
 };