From 6a5d805b383cd71bb1d0984964439c5ec08e9270 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 22 Jun 2014 11:41:05 -0400 Subject: more canvas refactoring. Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it could theoretically be used by any derived type. --- gtk2_ardour/editor_markers.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gtk2_ardour/editor_markers.cc') diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 66edefc211..4f6f1b91ce 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -64,7 +64,7 @@ Editor::add_new_location (Location *location) { ENSURE_GUI_THREAD (*this, &Editor::add_new_location, location); - ArdourCanvas::Layout* group = add_new_location_internal (location); + ArdourCanvas::Container* group = add_new_location_internal (location); /* Do a full update of the markers in this group */ update_marker_labels (group); @@ -82,14 +82,14 @@ Editor::add_new_location (Location *location) * the caller must call update_marker_labels () after calling this. * @return canvas group that the location's marker was added to. */ -ArdourCanvas::Layout* +ArdourCanvas::Container* Editor::add_new_location_internal (Location* location) { LocationMarkers *lam = new LocationMarkers; uint32_t color; /* make a note here of which group this marker ends up in */ - ArdourCanvas::Layout* group = 0; + ArdourCanvas::Container* group = 0; if (location->is_cd_marker()) { color = location_cd_marker_color; @@ -311,14 +311,14 @@ struct MarkerComparator { void Editor::update_marker_labels () { - for (std::map >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) { + for (std::map >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) { update_marker_labels (i->first); } } /** Look at all markers in a group and update label widths */ void -Editor::update_marker_labels (ArdourCanvas::Layout* group) +Editor::update_marker_labels (ArdourCanvas::Container* group) { list& sorted = _sorted_marker_lists[group]; @@ -1576,7 +1576,7 @@ Editor::toggle_marker_lines () void Editor::remove_sorted_marker (Marker* m) { - for (std::map >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) { + for (std::map >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) { i->second.remove (m); } } -- cgit v1.2.3