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/time_axis_view.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gtk2_ardour/time_axis_view.h') diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index cddf9f9e29..4c183ddc6a 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -59,7 +59,7 @@ namespace Gtk { namespace ArdourCanvas { class Canvas; - class Layout; + class Container; class Item; } @@ -104,8 +104,8 @@ class TimeAxisView : public virtual AxisView virtual void enter_internal_edit_mode () {} virtual void leave_internal_edit_mode () {} - ArdourCanvas::Layout* canvas_display () { return _canvas_display; } - ArdourCanvas::Layout* ghost_group () { return _ghost_group; } + ArdourCanvas::Container* canvas_display () { return _canvas_display; } + ArdourCanvas::Container* ghost_group () { return _ghost_group; } /** @return effective height (taking children into account) in canvas units, or 0 if this TimeAxisView has not yet been shown */ @@ -212,15 +212,15 @@ class TimeAxisView : public virtual AxisView std::string controls_base_selected_name; Gtk::Menu* display_menu; /* The standard LHS Track control popup-menus */ TimeAxisView* parent; - ArdourCanvas::Layout* selection_group; - ArdourCanvas::Layout* _ghost_group; + ArdourCanvas::Container* selection_group; + ArdourCanvas::Container* _ghost_group; std::list ghosts; std::list free_selection_rects; std::list used_selection_rects; bool _hidden; bool in_destructor; Gtk::Menu* _size_menu; - ArdourCanvas::Layout* _canvas_display; + ArdourCanvas::Container* _canvas_display; double _y_position; PublicEditor& _editor; -- cgit v1.2.3