canvas::Text: get maximum width (if displayed on a single line).

[simgear.git] / simgear / math / interpolater.hxx

diff --git a/simgear/math/interpolater.hxx b/simgear/math/interpolater.hxx
index 1681d9d3c1ff401e867c26078e9149806c2680d2..34dff6260cd39e2e3962ebe17001fcc142551cf7 100644 (file)
--- a/simgear/math/interpolater.hxx
+++ b/simgear/math/interpolater.hxx
@@ -35,12 +35,12 @@
 
 #include <simgear/compiler.h>
 
-#include "simgear/structure/SGReferenced.hxx"
+#include <simgear/structure/SGReferenced.hxx>
 
 #include <map>
+#include <string>
 
-#include STL_STRING
-SG_USING_STD(string);
+class SGPropertyNode;
 
 /**
  * A class that provids a simple linear 2d interpolation lookup table.
@@ -56,11 +56,18 @@ public:
      */
     SGInterpTable();
 
+    /**
+     * Constructor. Loads the interpolation table from an interpolation
+     * property node.
+     * @param interpolation property node having entry children
+     */
+    SGInterpTable(const SGPropertyNode* interpolation);
+
     /**
      * Constructor. Loads the interpolation table from the specified file.
      * @param file name of interpolation file
      */
-    SGInterpTable( const string& file );
+    SGInterpTable( const std::string& file );
 
 
     /**