diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-12 14:53:44 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-12 14:53:44 -0400 |
commit | 590882f3c8e063528452d71daffb36d3151da05e (patch) | |
tree | 27480b4b85a7d2a8aeae51c9c9470c196b8dfff8 /libs/canvas/canvas/rectangle.h | |
parent | 551014240a49ee11b9dc7541bbe8427ac3402aef (diff) |
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.
Diffstat (limited to 'libs/canvas/canvas/rectangle.h')
-rw-r--r-- | libs/canvas/canvas/rectangle.h | 8 |
1 files changed, 5 insertions, 3 deletions
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; |