Fix PBD::copy_file on windows to work with non-ascii paths

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

diff --git a/libs/canvas/canvas/flag.h b/libs/canvas/canvas/flag.h
index fe14a63d96160ef1ec44711c925dadaf8d4f7477..19a302b4b6b724beb752387ae33399d64633f120 100644 (file)
--- a/libs/canvas/canvas/flag.h
+++ b/libs/canvas/canvas/flag.h
@@ -17,8 +17,11 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "canvas/group.h"
+#include <pangomm/fontdescription.h>
+
+#include "canvas/visibility.h"
 #include "canvas/types.h"
+#include "canvas/container.h"
 
 namespace ArdourCanvas {
 
@@ -26,18 +29,22 @@ class Text;
 class Line;
 class Rectangle;
 
-class Flag : public Group
+class LIBCANVAS_API Flag : public Container
 {
 public:
-       Flag (Group *, Distance, Color, Color, Duple);
+       Flag (Canvas *, Distance, Color, Color, Duple);
+       Flag (Item*, Distance, Color, Color, Duple);
 
        void set_text (std::string const &);
        void set_height (Distance);
 
+       void set_font_description (Pango::FontDescription);
+
         bool covers (Duple const &) const;
        
 private:
-       Distance _height;
+       void setup (Distance height, Duple position);
+
        Color _outline_color;
        Color _fill_color;
        Text* _text;