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/ruler.cc | |
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/ruler.cc')
-rw-r--r-- | libs/canvas/ruler.cc | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc index aa48b52e92..1e7a731899 100644 --- a/libs/canvas/ruler.cc +++ b/libs/canvas/ruler.cc @@ -31,9 +31,8 @@ using namespace std; using namespace ArdourCanvas; -Ruler::Ruler (Group *p, const Metric& m) - : Item (p) - , Rectangle (p) +Ruler::Ruler (Canvas* c, const Metric& m) + : Rectangle (c) , _metric (m) , _lower (0) , _upper (0) @@ -41,9 +40,26 @@ Ruler::Ruler (Group *p, const Metric& m) { } -Ruler::Ruler (Group *p, const Metric& m, Rect const& r) - : Item (p) - , Rectangle (p, r) +Ruler::Ruler (Canvas* c, const Metric& m, Rect const& r) + : Rectangle (c, r) + , _metric (m) + , _lower (0) + , _upper (0) + , _need_marks (true) +{ +} + +Ruler::Ruler (Group* g, const Metric& m) + : Rectangle (g) + , _metric (m) + , _lower (0) + , _upper (0) + , _need_marks (true) +{ +} + +Ruler::Ruler (Group* g, const Metric& m, Rect const& r) + : Rectangle (g, r) , _metric (m) , _lower (0) , _upper (0) |