replace depreciated plib symbols with their new forms

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

diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index f081d88c0e4c07900a167a568f5b303d290daca7..26b89bb96566aff10e6f9de377be3b278b4abfba 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,15 @@ public:
 
 private:
 
+    enum {
+        BACKGROUND = 0x01,
+        FOREGROUND = 0x02,
+        HIGHLIGHT = 0x04,
+        LABEL = 0x08,
+        LEGEND = 0x10,
+        MISC = 0x20
+    };
+
     // Private copy constructor to avoid unpleasant surprises.
     FGDialog (const FGDialog &);
 
@@ -114,12 +126,18 @@ 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);
 
     // The top-level PUI object.
     puObject * _object;
 
+    // The GUI subsystem.
+    NewGUI * _gui;
+
     // 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
@@ -141,6 +159,8 @@ private:
     // dialog closes.
     char ** make_char_array (int size);
     vector<char **> _char_arrays;
+
+    SGPath _font_path;
 };
 
 //
@@ -157,7 +177,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;