Melchior: Make line wrapping in textboxes configurable, and enable it by default

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

diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index 2cb6f4ed16365ff4940c64368117d909991f97a9..0e3dc6c6f79eeaa8f1f4d1562ffd56711d40f92b 100644 (file)
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -8,6 +8,7 @@
 #endif
 
 #include <plib/pu.h>
+#include <plib/sg.h>
 
 #include <simgear/compiler.h>  // for SG_USING_STD
 #include <simgear/props/props.hxx>
@@ -91,6 +92,11 @@ public:
     virtual void applyValues ();
 
 
+    /**
+     * Update state.  Called on active dialogs before rendering.
+     */
+    virtual void update ();
+
 private:
 
     // Private copy constructor to avoid unpleasant surprises.
@@ -108,7 +114,8 @@ private:
 
     // Common configuration for all GUI group objects.
     void setupGroup (puGroup * group, SGPropertyNode * props,
-                     int width, int height, bool makeFrame = false);
+                     int width, int height, sgVec4 color,
+                     bool makeFrame = false);
 
     // The top-level PUI object.
     puObject * _object;
@@ -127,6 +134,7 @@ private:
         SGPropertyNode_ptr node;
     };
     vector<PropertyObject *> _propertyObjects;
+    vector<PropertyObject *> _liveObjects;
 
     // PUI doesn't copy arrays, so we have to allocate string arrays
     // and then keep pointers so that we can delete them when the
@@ -149,6 +157,7 @@ class fgPopup : public puPopup {
 public:
     fgPopup(int x, int y) : puPopup(x, y) { _dragging = false; }
     int checkHit(int b, int up, int x, int y);
+    int getHitObjects(puObject *, int x, int y);
 private:
     bool _dragging;
     int _dX, _dY;