release: 1.3.40

[lilypond.git] / lily / axis-group-interface.cc

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index d00b7a1cea7644ac348b59d353f34e283035504c..8cdb9ef67a2f7892d253b5bd50087be9114cb119 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -12,13 +12,12 @@
 #include "dimension-cache.hh"
 
 Axis_group_interface::Axis_group_interface (Score_element*s)
-  : Group_interface (s)
 {
   elt_l_ = s;
 }
 
 Axis_group_interface
-axis_group (Score_element*s)
+Axis_group_interface (Score_element*s)
 {
   return Axis_group_interface (s);
 }
@@ -37,7 +36,7 @@ Axis_group_interface::add_element (Score_element *e)
        e->set_parent (elt_l_, a);
     }
 
-  Group_interface::add_element (e);
+  Group_interface (elt_l_).add_element (e);
 
   elt_l_->add_dependency (e);
 }
@@ -99,8 +98,8 @@ Axis_group_interface::set_axes (Axis a1, Axis a2)
   if (a1 != Y_AXIS && a2 != Y_AXIS)
     elt_l_->set_empty (Y_AXIS);
   
-  elt_l_->dim_cache_[a1]->set_callback (Axis_group_interface::group_extent_callback);
-  elt_l_->dim_cache_[a2]->set_callback (Axis_group_interface::group_extent_callback);
+  elt_l_->dim_cache_[a1]->set_extent_callback (Axis_group_interface::group_extent_callback);
+  elt_l_->dim_cache_[a2]->set_extent_callback (Axis_group_interface::group_extent_callback);
 }
 
 Link_array<Score_element> 
@@ -116,7 +115,7 @@ Axis_group_interface::get_children ()
     {
       Score_element* e = unsmob_element (gh_car (ep));
       if (e)
-       childs.concat (axis_group (e).get_children ());
+       childs.concat (Axis_group_interface (e).get_children ());
     }
   
   return childs;