change Canvas heirarchy and constructors

Items no longer need a parent group (they require a Canvas pointer instead), so all constructors have been rationalized
and have two variants, one with a parent and one with a canvas.

All Items now inherit from Fill and Outline, to banish diagonal inheritance and virtual base classes and all that.

There were zero changes to the Ardour GUI arising from these changes.

24 files changed, 93 insertions, 55 deletions

diff --git a/libs/canvas/canvas/arc.h b/libs/canvas/canvas/arc.h
index 306a1acb7b..5eaa4a0ab9 100644
--- a/libs/canvas/canvas/arc.h
+++ b/libs/canvas/canvas/arc.h
@@ -26,10 +26,13 @@
 
 namespace ArdourCanvas {
 
-class LIBCANVAS_API Arc : virtual public Item, public Outline, public Fill
+class Canvas;
+
+class LIBCANVAS_API Arc : public Item
 {
 public:
-	Arc (Group *);
+	Arc (Canvas*);
+	Arc (Group*);
 
 	void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
 	void compute_bounding_box () const;
diff --git a/libs/canvas/canvas/arrow.h b/libs/canvas/canvas/arrow.h
index 9d9fe0d700..75c21da07c 100644
--- a/libs/canvas/canvas/arrow.h
+++ b/libs/canvas/canvas/arrow.h
@@ -31,6 +31,7 @@
 
 namespace ArdourCanvas {
 
+class Canvas;
 class Line;
 class Polygon;
 
@@ -48,7 +49,8 @@ class Polygon;
 class LIBCANVAS_API Arrow : public Group
 {
 public:
-	Arrow (Group *);
+	Arrow (Canvas*);
+	Arrow (Group*);
 
 	void set_show_head (int, bool);
 	void set_head_outward (int, bool);
@@ -68,6 +70,7 @@ public:
 
 private:
 	void setup_polygon (int);
+	void setup ();
 
 	/** Representation of a single arrow head */
 	struct Head {
diff --git a/libs/canvas/canvas/circle.h b/libs/canvas/canvas/circle.h
index ee17208a1f..1ca376a7a2 100644
--- a/libs/canvas/canvas/circle.h
+++ b/libs/canvas/canvas/circle.h
@@ -27,8 +27,9 @@ namespace ArdourCanvas {
 
 class LIBCANVAS_API Circle : public Arc
 {
-public:
-	Circle (Group *);
+  public:
+	Circle (Canvas*);
+	Circle (Group*);
 };
 	
 }
diff --git a/libs/canvas/canvas/curve.h b/libs/canvas/canvas/curve.h
index 234956763b..1bcab58e32 100644
--- a/libs/canvas/canvas/curve.h
+++ b/libs/canvas/canvas/curve.h
@@ -29,10 +29,11 @@ namespace ArdourCanvas {
 
 class XFadeCurve;
 
-class LIBCANVAS_API Curve : public PolyItem, public Fill, public InterpolatedCurve
+class LIBCANVAS_API Curve : public PolyItem, public InterpolatedCurve
 {
-public:
-    Curve (Group *);
+  public:
+    Curve (Canvas*);
+    Curve (Group*);
 
     enum CurveFill {
 	    None,
diff --git a/libs/canvas/canvas/fill.h b/libs/canvas/canvas/fill.h
index 56044de4bd..a4a36eb345 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);
@@ -51,7 +56,8 @@ 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;
diff --git a/libs/canvas/canvas/flag.h b/libs/canvas/canvas/flag.h
index 2a15f83921..2429e1775e 100644
--- a/libs/canvas/canvas/flag.h
+++ b/libs/canvas/canvas/flag.h
@@ -30,7 +30,8 @@ class Rectangle;
 class LIBCANVAS_API Flag : public Group
 {
 public:
-	Flag (Group *, Distance, Color, Color, Duple);
+	Flag (Canvas *, Distance, Color, Color, Duple);
+	Flag (Group*, Distance, Color, Color, Duple);
 
 	void set_text (std::string const &);
 	void set_height (Distance);
@@ -38,6 +39,8 @@ public:
         bool covers (Duple const &) const;
 	
 private:
+	void setup (Distance height, Duple position);
+
 	Color _outline_color;
 	Color _fill_color;
 	Text* _text;
diff --git a/libs/canvas/canvas/group.h b/libs/canvas/canvas/group.h
index a9150e7d09..6bfc40ba28 100644
--- a/libs/canvas/canvas/group.h
+++ b/libs/canvas/canvas/group.h
@@ -33,9 +33,10 @@ namespace ArdourCanvas {
 class LIBCANVAS_API Group : public Item
 {
 public:
-	explicit Group (Group *);
-	explicit Group (Group *, Duple);
-	~Group ();
+	Group (Canvas*);
+	Group (Group*);
+	Group (Group*, Duple const& positon);
+	virtual ~Group ();
 
 	void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
 	virtual void compute_bounding_box () const;
@@ -60,14 +61,9 @@ public:
 
 	static int default_items_per_cell;
 
-protected:
-	
-	explicit Group (Canvas *);
-	
 private:
 	friend class ::OptimizingLookupTableTest;
 	
-	Group (Group const &);
 	void ensure_lut () const;
 	void invalidate_lut () const;
 	void clear_items (bool with_delete);
diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h
index d54edd3827..fd86818c21 100644
--- a/libs/canvas/canvas/image.h
+++ b/libs/canvas/canvas/image.h
@@ -34,7 +34,8 @@ namespace ArdourCanvas {
 class LIBCANVAS_API Image : public Item
 {
 public:
-    Image (Group *, Cairo::Format, int width, int height);
+    Image (Canvas *, Cairo::Format, int width, int height);
+    Image (Group*, Cairo::Format, int width, int height);
     
     struct Data {
 	Data (uint8_t *d, int w, int h, int s, Cairo::Format fmt)
diff --git a/libs/canvas/canvas/item.h b/libs/canvas/canvas/item.h
index ff3095d1ff..bf752f66db 100644
--- a/libs/canvas/canvas/item.h
+++ b/libs/canvas/canvas/item.h
@@ -30,6 +30,8 @@
 
 #include "canvas/visibility.h"
 #include "canvas/types.h"
+#include "canvas/fill.h"
+#include "canvas/outline.h"
 
 namespace ArdourCanvas
 {
@@ -50,12 +52,12 @@ class ScrollGroup;
  *  and all except the `root group' have a pointer to their parent group.
  */
 	
-class LIBCANVAS_API Item
+class LIBCANVAS_API Item : public Fill, public Outline
 {
 public:
 	Item (Canvas *);
 	Item (Group *);
-	Item (Group *, Duple);
+	Item (Group *, Duple const& p);
 	virtual ~Item ();
 
         void redraw () const;
@@ -219,6 +221,8 @@ public:
         std::string whatami() const;
 
 protected:
+	friend class Fill;
+	friend class Outline;
 
         /** To be called at the beginning of any property change that
 	 *  may alter the bounding box of this item
diff --git a/libs/canvas/canvas/line.h b/libs/canvas/canvas/line.h
index 85b1d41e15..e8f57a00ba 100644
--- a/libs/canvas/canvas/line.h
+++ b/libs/canvas/canvas/line.h
@@ -27,10 +27,11 @@
 
 namespace ArdourCanvas {
 
-class LIBCANVAS_API Line : virtual public Item, public Outline
+class LIBCANVAS_API Line : public Item
 {
-public:
-	Line (Group *);
+  public:
+	Line (Canvas*);
+	Line (Group*);
 
 	void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
 	void compute_bounding_box () const;
diff --git a/libs/canvas/canvas/line_set.h b/libs/canvas/canvas/line_set.h
index 69f2b96907..38f97250ce 100644
--- a/libs/canvas/canvas/line_set.h
+++ b/libs/canvas/canvas/line_set.h
@@ -35,7 +35,8 @@ public:
 		Horizontal
 	};
 
-	LineSet (Group *, Orientation o = Vertical);
+	LineSet (Canvas*, Orientation o = Vertical);
+	LineSet (Group*, Orientation o = Vertical);
 
 	void compute_bounding_box () const;
 	void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
diff --git a/libs/canvas/canvas/outline.h b/libs/canvas/canvas/outline.h
index 972c07b11c..474501c8c7 100644
--- a/libs/canvas/canvas/outline.h
+++ b/libs/canvas/canvas/outline.h
@@ -22,17 +22,20 @@
 
 #include <stdint.h>
 
+#include <boost/noncopyable.hpp>
+
 #include "canvas/visibility.h"
 #include "canvas/types.h"
-#include "canvas/item.h"
 
 namespace ArdourCanvas {
 
-class LIBCANVAS_API Outline : virtual public Item
+class Item;
+
+class LIBCANVAS_API Outline : public boost::noncopyable
 {
 public:
-	Outline (Group *);
-	virtual ~Outline () {}
+	Outline (Item& self);
+	virtual ~Outline() {}
 
 	Color outline_color () const {
 		return _outline_color;
@@ -55,10 +58,11 @@ public:
 protected:
 
 	void setup_outline_context (Cairo::RefPtr<Cairo::Context>) const;
-	
-	Color _outline_color;
+
+	Item&    _self;
+	Color    _outline_color;
 	Distance _outline_width;
-	bool _outline;
+	bool     _outline;
 };
 
 }
diff --git a/libs/canvas/canvas/pixbuf.h b/libs/canvas/canvas/pixbuf.h
index 3974b560a9..eba73e57bf 100644
--- a/libs/canvas/canvas/pixbuf.h
+++ b/libs/canvas/canvas/pixbuf.h
@@ -34,7 +34,8 @@ namespace ArdourCanvas {
 class LIBCANVAS_API Pixbuf : public Item
 {
 public:
-	Pixbuf (Group *);
+	Pixbuf (Canvas*);
+	Pixbuf (Group*);
 
 	void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
 	void compute_bounding_box () const;
diff --git a/libs/canvas/canvas/poly_item.h b/libs/canvas/canvas/poly_item.h
index 4745d24ab9..ab68204ff0 100644
--- a/libs/canvas/canvas/poly_item.h
+++ b/libs/canvas/canvas/poly_item.h
@@ -26,10 +26,11 @@
 
 namespace ArdourCanvas {
 
-class LIBCANVAS_API PolyItem : virtual public Item, public Outline
+class LIBCANVAS_API PolyItem : public Item
 {
 public:
-	PolyItem (Group *);
+	PolyItem (Canvas*);
+	PolyItem (Group*);
 
 	void compute_bounding_box () const;
 
diff --git a/libs/canvas/canvas/poly_line.h b/libs/canvas/canvas/poly_line.h
index 4f1b2b0157..5476711e97 100644
--- a/libs/canvas/canvas/poly_line.h
+++ b/libs/canvas/canvas/poly_line.h
@@ -29,7 +29,8 @@ namespace ArdourCanvas {
 class LIBCANVAS_API PolyLine : public PolyItem
 {
   public:
-	PolyLine (Group *);
+	PolyLine (Canvas*);
+	PolyLine (Group*);
 	
 	void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
 	
diff --git a/libs/canvas/canvas/polygon.h b/libs/canvas/canvas/polygon.h
index 917122a9a2..a3eed37cdc 100644
--- a/libs/canvas/canvas/polygon.h
+++ b/libs/canvas/canvas/polygon.h
@@ -27,10 +27,11 @@
 
 namespace ArdourCanvas {
 
-class LIBCANVAS_API Polygon : public PolyItem, public Fill
+class LIBCANVAS_API Polygon : public PolyItem
 {
 public:
-	Polygon (Group *);
+	Polygon (Canvas*);
+	Polygon (Group*);
         virtual ~Polygon();
 
 	void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
diff --git a/libs/canvas/canvas/rectangle.h b/libs/canvas/canvas/rectangle.h
index 91f23f9336..ff6eca3cd9 100644
--- a/libs/canvas/canvas/rectangle.h
+++ b/libs/canvas/canvas/rectangle.h
@@ -29,11 +29,13 @@
 namespace ArdourCanvas
 {
 
-class LIBCANVAS_API Rectangle : virtual public Item, public Outline, public Fill
+class LIBCANVAS_API Rectangle : public Item
 {
 public:
-	Rectangle (Group *);
-	Rectangle (Group *, Rect const &);
+	Rectangle (Canvas*);
+	Rectangle (Canvas*, Rect const &);
+	Rectangle (Group*);
+	Rectangle (Group*, Rect const &);
 	
 	void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
 	void compute_bounding_box () const;
diff --git a/libs/canvas/canvas/ruler.h b/libs/canvas/canvas/ruler.h
index 72e38b56f9..633a1d569e 100644
--- a/libs/canvas/canvas/ruler.h
+++ b/libs/canvas/canvas/ruler.h
@@ -55,8 +55,10 @@ public:
 		virtual void get_marks (std::vector<Mark>&, double lower, double upper, int maxchars) const = 0;
 	};
 	
-	Ruler (Group *, const Metric& m);
-	Ruler (Group *, const Metric& m, Rect const&);
+	Ruler (Canvas*, const Metric& m);
+	Ruler (Canvas*, const Metric& m, Rect const&);
+	Ruler (Group*, const Metric& m);
+	Ruler (Group*, const Metric& m, Rect const&);
 	
 	void set_range (double lower, double upper);
 	void set_font_description (Pango::FontDescription);
diff --git a/libs/canvas/canvas/scroll_group.h b/libs/canvas/canvas/scroll_group.h
index 7652ae2e9b..552538eb21 100644
--- a/libs/canvas/canvas/scroll_group.h
+++ b/libs/canvas/canvas/scroll_group.h
@@ -31,8 +31,8 @@ class LIBCANVAS_API ScrollGroup : public Group
 		ScrollsHorizontally = 0x2
 	};
 	
-	explicit ScrollGroup (Group *, ScrollSensitivity);
-	explicit ScrollGroup (Group *, Duple, ScrollSensitivity);
+	ScrollGroup (Canvas*, ScrollSensitivity);
+	ScrollGroup (Group*, ScrollSensitivity);
 
 	void scroll_to (Duple const& d);
 	Duple scroll_offset() const { return _scroll_offset; }
diff --git a/libs/canvas/canvas/stateful_image.h b/libs/canvas/canvas/stateful_image.h
index 80687c5113..5952752e71 100644
--- a/libs/canvas/canvas/stateful_image.h
+++ b/libs/canvas/canvas/stateful_image.h
@@ -49,6 +49,7 @@ class StatefulImage : public Item
 
   public:
 
+    StatefulImage (Canvas*, const XMLNode&);
     StatefulImage (Group*, const XMLNode&);
     ~StatefulImage ();
 
diff --git a/libs/canvas/canvas/text.h b/libs/canvas/canvas/text.h
index 59d2007ceb..cc6d5c815d 100644
--- a/libs/canvas/canvas/text.h
+++ b/libs/canvas/canvas/text.h
@@ -31,7 +31,8 @@ namespace ArdourCanvas {
 class LIBCANVAS_API Text : public Item
 {
 public:
-	Text (Group *);
+	Text (Canvas*);
+	Text (Group*);
        ~Text();
 
 	void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
diff --git a/libs/canvas/canvas/wave_view.h b/libs/canvas/canvas/wave_view.h
index 6327277ef4..674df969a5 100644
--- a/libs/canvas/canvas/wave_view.h
+++ b/libs/canvas/canvas/wave_view.h
@@ -45,7 +45,7 @@ class WaveViewTest;
 	
 namespace ArdourCanvas {
 
-class LIBCANVAS_API WaveView : virtual public Item, public Outline, public Fill
+class LIBCANVAS_API WaveView : public Item
 {
 public:
 
@@ -86,7 +86,8 @@ public:
     */
 
 
-	WaveView (Group *, boost::shared_ptr<ARDOUR::AudioRegion>);
+	WaveView (Canvas *, boost::shared_ptr<ARDOUR::AudioRegion>);
+	WaveView (Group*, boost::shared_ptr<ARDOUR::AudioRegion>);
        ~WaveView ();
 
 	void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
diff --git a/libs/canvas/canvas/widget.h b/libs/canvas/canvas/widget.h
index 18822ef185..842f336a51 100644
--- a/libs/canvas/canvas/widget.h
+++ b/libs/canvas/canvas/widget.h
@@ -28,10 +28,11 @@
 namespace ArdourCanvas
 {
 
-class LIBCANVAS_API Widget : virtual public Item
+class LIBCANVAS_API Widget : public Item
 {
 public:
-	Widget (Group *, CairoWidget&);
+	Widget (Canvas*, CairoWidget&);
+	Widget (Group*, CairoWidget&);
 	
 	void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
 	void compute_bounding_box () const;
diff --git a/libs/canvas/canvas/xfade_curve.h b/libs/canvas/canvas/xfade_curve.h
index a1151817e2..d6a10d1f86 100644
--- a/libs/canvas/canvas/xfade_curve.h
+++ b/libs/canvas/canvas/xfade_curve.h
@@ -34,8 +34,10 @@ public:
 		End,
 	};
 
-	XFadeCurve (Group *);
-	XFadeCurve (Group *, XFadePosition);
+	XFadeCurve (Canvas *);
+	XFadeCurve (Canvas *, XFadePosition);
+	XFadeCurve (Group*);
+	XFadeCurve (Group*, XFadePosition);
 
 	void set_fade_position (XFadePosition xfp) { _xfadeposition = xfp; }