summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-05-21 15:21:39 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-05-21 15:21:39 +0000
commitae8b97416abb6ec7282c0b16e5842364b59928fc (patch)
tree65328f06ea9e2c415bb322352dc30752bd24c875
parent267129c1fca5ec89b9e95aa06c40069e73d11dc4 (diff)
rename the last rename that renamed the previous one ...
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@7135 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/editor_selection.cc2
-rw-r--r--gtk2_ardour/time_axis_view.cc4
-rw-r--r--gtk2_ardour/time_axis_view.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index c58f8926ff..37f9968022 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -829,7 +829,7 @@ Editor::track_selection_changed ()
}
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- (*i)->show_selection (*selection);
+ (*i)->show_selected (*selection);
}
ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty());
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 07946bb8bc..fcfc1d0772 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -588,11 +588,11 @@ TimeAxisView::popup_size_menu (guint32 when)
}
void
-TimeAxisView::show_selection (Selection &selection)
+TimeAxisView::show_selected (Selection &selection)
{
//give children a chance to be selected
for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
- (*i)->show_selection (selection);
+ (*i)->show_selected (selection);
}
//determine if I am in the selection
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 703a1642fa..7ecadbf1db 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -155,7 +155,7 @@ class TimeAxisView : public virtual AxisView, public Stateful
virtual void hide ();
bool hidden() const { return _hidden; }
- virtual void show_selection (Selection&);
+ virtual void show_selected (Selection&);
/**
* potential handler for entered events