merge with master.

[ardour.git] / libs / canvas / root_group.cc

diff --git a/libs/canvas/root_group.cc b/libs/canvas/root_group.cc
index cded570b2c900151ffd31ddb54b05a337bd58370..accbcb9b3030775a09945f5f7b0cb28df16f94b1 100644 (file)
--- a/libs/canvas/root_group.cc
+++ b/libs/canvas/root_group.cc
@@ -23,8 +23,8 @@
 using namespace std;
 using namespace ArdourCanvas;
 
-RootGroup::RootGroup (Canvas* canvas)
-       : Group (canvas)
+Root::Root (Canvas* canvas)
+       : Container (canvas)
 {
 #ifdef CANVAS_DEBUG
        name = "ROOT";
@@ -32,11 +32,12 @@ RootGroup::RootGroup (Canvas* canvas)
 }
 
 void
-RootGroup::compute_bounding_box () const
+Root::compute_bounding_box () const
 {
-       Group::compute_bounding_box ();
+       Container::compute_bounding_box ();
 
        if (_bounding_box) {
-               _canvas->request_size (Duple (_bounding_box.get().width (), _bounding_box.get().height ()));
+               Rect r (_bounding_box.get());
+               _canvas->request_size (Duple (r.width (), r.height ()));
        }
 }