diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 14:45:56 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 14:59:11 -0400 |
| commit | ea5fa64c0bcfb6a916326756b5f84a78a2478025 (patch) | |
| tree | 8efeb2699db85570a8dbf8935148c5cb9413f1f6 /gtk2_ardour/time_axis_view.cc | |
| parent | d381714510ef066416ea16623102b27de8aa6f38 (diff) | |
manually fix up various cases where Gtk:Frame foo_frame had been changed to foo_sample
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 2de7934f5c..f61ee95608 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -199,9 +199,9 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie controls_ebox.signal_leave_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_leave)); controls_ebox.show (); - time_axis_sample.set_shadow_type (Gtk::SHADOW_NONE); - time_axis_sample.add(top_hbox); - time_axis_sample.show(); + time_axis_frame.set_shadow_type (Gtk::SHADOW_NONE); + time_axis_frame.add(top_hbox); + time_axis_frame.show(); HSeparator* separator = manage (new HSeparator()); separator->set_name("TrackSeparator"); @@ -213,7 +213,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie midi_scroomer_size_group->add_widget (scroomer_placeholder); time_axis_vbox.pack_start (*separator, false, false); - time_axis_vbox.pack_start (time_axis_sample, true, true); + time_axis_vbox.pack_start (time_axis_frame, true, true); time_axis_vbox.show(); time_axis_hbox.pack_start (time_axis_vbox, true, true); time_axis_hbox.show(); @@ -757,14 +757,14 @@ TimeAxisView::set_selected (bool yn) AxisView::set_selected (yn); if (_selected) { - time_axis_sample.set_shadow_type (Gtk::SHADOW_IN); - time_axis_sample.set_name ("MixerStripSelectedFrame"); + time_axis_frame.set_shadow_type (Gtk::SHADOW_IN); + time_axis_frame.set_name ("MixerStripSelectedFrame"); controls_ebox.set_name (controls_base_selected_name); controls_vbox.set_name (controls_base_selected_name); time_axis_vbox.set_name (controls_base_selected_name); } else { - time_axis_sample.set_shadow_type (Gtk::SHADOW_NONE); - time_axis_sample.set_name (controls_base_unselected_name); + time_axis_frame.set_shadow_type (Gtk::SHADOW_NONE); + time_axis_frame.set_name (controls_base_unselected_name); controls_ebox.set_name (controls_base_unselected_name); controls_vbox.set_name (controls_base_unselected_name); time_axis_vbox.set_name (controls_base_unselected_name); @@ -772,7 +772,7 @@ TimeAxisView::set_selected (bool yn) hide_selection (); } - time_axis_sample.show(); + time_axis_frame.show(); } void @@ -818,8 +818,9 @@ TimeAxisView::show_selection (TimeSelection& ts) double x1; double x2; double y2; - SelectionRect *rect; time_axis_sample.show(); + SelectionRect *rect; + time_axis_frame.show(); for (Children::iterator i = children.begin(); i != children.end(); ++i) { if (!(*i)->selected () && !(*i)->propagate_time_selection ()) { |