merge with master and fix 4 conflicts by hand

[ardour.git] / libs / canvas / canvas / text.h

diff --git a/libs/canvas/canvas/text.h b/libs/canvas/canvas/text.h
index 4431cb9a80d5256595a241bb4b0f8ea7656f9670..59d2007ceba17d30828d9f2874eaac3318b70e2d 100644 (file)
--- a/libs/canvas/canvas/text.h
+++ b/libs/canvas/canvas/text.h
@@ -23,11 +23,12 @@
 #include <pangomm/fontdescription.h>
 #include <pangomm/layout.h>
 
+#include "canvas/visibility.h"
 #include "canvas/item.h"
 
 namespace ArdourCanvas {
 
-class Text : public Item
+class LIBCANVAS_API Text : public Item
 {
 public:
        Text (Group *);
@@ -46,6 +47,8 @@ public:
         void set_size_chars (int nchars);
         void dump (std::ostream&) const;
 
+       std::string text() const { return _text; }
+
 private:
        std::string      _text;
        uint32_t         _color;