merge with master, including manual merge conflict resolution

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

diff --git a/libs/canvas/canvas/text.h b/libs/canvas/canvas/text.h
index ccc8d04dd55cfb8ca4484812246f69ddae8eacd3..08e2a469a7a2513333a34d263367117378e57aed 100644 (file)
--- a/libs/canvas/canvas/text.h
+++ b/libs/canvas/canvas/text.h
@@ -1,3 +1,6 @@
+#ifndef __ardour_canvas_text_h__
+#define __ardour_canvas_text_h__
+
 #include <pangomm/fontdescription.h>
 #include <pangomm/layout.h>
 
@@ -9,6 +12,7 @@ class Text : public Item
 {
 public:
        Text (Group *);
+       ~Text();
 
        void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
        void compute_bounding_box () const;
@@ -17,7 +21,7 @@ public:
 
        void set (std::string const &);
        void set_color (uint32_t);
-       void set_font_description (Pango::FontDescription *);
+       void set_font_description (Pango::FontDescription);
        void set_alignment (Pango::Alignment);
 
 private:
@@ -30,3 +34,5 @@ private:
 };
 
 }
+
+#endif /* __ardour_canvas_text_h__ */