CanvasImage: improve fetching from http and add mime detection.

[simgear.git] / simgear / canvas / elements / CanvasText.hxx

diff --git a/simgear/canvas/elements/CanvasText.hxx b/simgear/canvas/elements/CanvasText.hxx
index 0937e5910d5640a95f24696acc5e259f3b6cb055..aba96319173d6220be31c8d42b79db502ef3ea7d 100644 (file)
--- a/simgear/canvas/elements/CanvasText.hxx
+++ b/simgear/canvas/elements/CanvasText.hxx
@@ -33,24 +33,26 @@ namespace canvas
     public Element
   {
     public:
+      static const std::string TYPE_NAME;
+      static void staticInit();
+
       Text( const CanvasWeakPtr& canvas,
             const SGPropertyNode_ptr& node,
-            const Style& parent_style );
+            const Style& parent_style,
+            Element* parent = 0 );
       ~Text();
 
       void setText(const char* text);
       void setFont(const char* name);
       void setAlignment(const char* align);
 
+      osg::Vec2 getNearestCursor(const osg::Vec2& pos) const;
+
     protected:
 
       class TextOSG;
       osg::ref_ptr<TextOSG> _text;
 
-      virtual void childChanged(SGPropertyNode * child);
-
-      void handleHit(float x, float y);
-
   };
 
 } // namespace canvas