Fix broken logic and possible NULL pointer dereference for Bundle XML.

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

diff --git a/libs/canvas/canvas/fill.h b/libs/canvas/canvas/fill.h
index 56044de4bd29f72d6c24f19636204af0b6ebdf2b..9eddeec6b606984e990048cc4776f561fae695b2 100644 (file)
--- 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);
@@ -48,15 +53,20 @@ public:
        
         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;
+
 };
 
 }