X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas%2Ffill.h;h=42160a61907bbe09a803fff5062a9a4bef9e64cb;hb=6a622d86dca2c8af8993d85be8bd8a44debc5b8c;hp=23708e42e51405c84af8e37ef4537d89883a6ca4;hpb=e7c47747286c16aa575456b07120e1e8e8271bd5;p=ardour.git

diff --git a/libs/canvas/canvas/fill.h b/libs/canvas/canvas/fill.h
index 23708e42e5..42160a6190 100644
--- a/libs/canvas/canvas/fill.h
+++ b/libs/canvas/canvas/fill.h
@@ -23,15 +23,20 @@
 #include <vector>
 #include <stdint.h>
 
+#include <boost/noncopyable.hpp>
+
 #include "canvas/visibility.h"
-#include "canvas/item.h"
+#include "canvas/types.h"
 
 namespace ArdourCanvas {
 
-class LIBCANVAS_API Fill : virtual public Item
+class Item;
+
+class LIBCANVAS_API Fill : public boost::noncopyable
 {
 public:
-	Fill (Group *);
+	Fill (Item& self);
+	virtual ~Fill() {}
 
 	virtual void set_fill_color (Color);
 	virtual void set_fill (bool);
@@ -45,17 +50,23 @@ public:
 	}
 
         typedef std::vector<std::pair<double,Color> > StopList;
-	
+
         void set_gradient (StopList const & stops, bool is_vertical);
 
+        void set_pattern (Cairo::RefPtr<Cairo::Pattern>);
+
 protected:
 	void setup_fill_context (Cairo::RefPtr<Cairo::Context>) const;
         void setup_gradient_context (Cairo::RefPtr<Cairo::Context>, Rect const &, Duple const &) const;
-       	
+
+       	Item& _self;
 	Color _fill_color;
 	bool _fill;
+	bool _transparent;
         StopList _stops;
         bool _vertical_gradient;
+        Cairo::RefPtr<Cairo::Pattern> _pattern;
+
 };
 
 }