Change some declarations from 'struct' to 'class' (and vice-versa)

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

diff --git a/libs/canvas/canvas/fill.h b/libs/canvas/canvas/fill.h
index f52260c571367c689cf5a97a0353a40d6805a5ad..a4a36eb3451349873cd418d5810b9a014a77c65e 100644 (file)
--- a/libs/canvas/canvas/fill.h
+++ b/libs/canvas/canvas/fill.h
@@ -22,14 +22,21 @@
 
 #include <vector>
 #include <stdint.h>
-#include "canvas/item.h"
+
+#include <boost/noncopyable.hpp>
+
+#include "canvas/visibility.h"
+#include "canvas/types.h"
 
 namespace ArdourCanvas {
 
-class 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);
@@ -49,9 +56,11 @@ public:
 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;
 };